image-rs: change namespace of ICR images

Change the namespace of images stored in ICR used for the simple signing XRSS tests. Fixes: #382 Signed-off-by: Matthew Arnold <mattarno@uk.ibm.com>
confidential-containers · Nov 4, 2023 · ad0bdd2 · ad0bdd2
1 parent 8dd91e0
commit ad0bdd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/image-rs/test_data/offline-fs-kbc/aa-offline_fs_kbc-resources-for-icr.json b/image-rs/test_data/offline-fs-kbc/aa-offline_fs_kbc-resources-for-icr.json
@@ -1,5 +1,5 @@
 {
-  "default/security-policy/test": "ewogICAgImRlZmF1bHQiOiBbCiAgICAgICAgewogICAgICAgICAgICAidHlwZSI6ICJpbnNlY3VyZUFjY2VwdEFueXRoaW5nIgogICAgICAgIH0KICAgIF0sCiAgICAidHJhbnNwb3J0cyI6IHsKICAgICAgICAiZG9ja2VyIjogewogICAgICAgICAgICAidWsuaWNyLmlvL21hdHRhcm5vX2ltYWdlX3B1c2gvYnVzeWJveCI6IFsKICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAidHlwZSI6ICJzaWduZWRCeSIsCiAgICAgICAgICAgICAgICAgICAgImtleVR5cGUiOiAiR1BHS2V5cyIsCiAgICAgICAgICAgICAgICAgICAgImtleVBhdGgiOiAia2JzOi8vL2RlZmF1bHQvZ3BnLXB1YmxpYy1rZXkvdGVzdCIKICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgXSwKICAgICAgICAgICAgInF1YXkuaW8va2F0YS1jb250YWluZXJzL2NvbmZpZGVudGlhbC1jb250YWluZXJzIjogWwogICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICJ0eXBlIjogInNpZ25lZEJ5IiwKICAgICAgICAgICAgICAgICAgICAia2V5VHlwZSI6ICJHUEdLZXlzIiwKICAgICAgICAgICAgICAgICAgICAia2V5UGF0aCI6ICJrYnM6Ly8vZGVmYXVsdC9ncGctcHVibGljLWtleS90ZXN0IgogICAgICAgICAgICAgICAgfQogICAgICAgICAgICBdCiAgICAgICAgfQogICAgfQp9Cg==",
+  "default/security-policy/test": "ewogICAgImRlZmF1bHQiOiBbCiAgICAgICAgewogICAgICAgICAgICAidHlwZSI6ICJpbnNlY3VyZUFjY2VwdEFueXRoaW5nIgogICAgICAgIH0KICAgIF0sCiAgICAidHJhbnNwb3J0cyI6IHsKICAgICAgICAiZG9ja2VyIjogewogICAgICAgICAgICAidWsuaWNyLmlvL2thdGEtY29udGFpbmVycy9idXN5Ym94IjogWwogICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgICJ0eXBlIjogInNpZ25lZEJ5IiwKICAgICAgICAgICAgICAgICAgICAia2V5VHlwZSI6ICJHUEdLZXlzIiwKICAgICAgICAgICAgICAgICAgICAia2V5UGF0aCI6ICJrYnM6Ly8vZGVmYXVsdC9ncGctcHVibGljLWtleS90ZXN0IgogICAgICAgICAgICAgICAgfQogICAgICAgICAgICBdLAogICAgICAgICAgICAicXVheS5pby9rYXRhLWNvbnRhaW5lcnMvY29uZmlkZW50aWFsLWNvbnRhaW5lcnMiOiBbCiAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgInR5cGUiOiAic2lnbmVkQnkiLAogICAgICAgICAgICAgICAgICAgICJrZXlUeXBlIjogIkdQR0tleXMiLAogICAgICAgICAgICAgICAgICAgICJrZXlQYXRoIjogImticzovLy9kZWZhdWx0L2dwZy1wdWJsaWMta2V5L3Rlc3QiCiAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgIF0KICAgICAgICB9CiAgICB9Cn0K",
   "default/sigstore-config/test": "",
   "default/gpg-public-key/test": "LS0tLS1CRUdJTiBQR1AgUFVCTElDIEtFWSBCTE9DSy0tLS0tCgptUUdOQkdUd2MzRUJEQURvbHowcmxwTGRkR2R1SENaZERnSEd1Y1lKeFh0elAwRE9zMkEvOTlKN1lhd3VjcTNSCmhlaHVUcmdRWkhpNCtmM28zU3V4QmUzeFdSc1F5dDRCbDBaVFJ6bmdqdXoyTWFxNzV4M0RNSUYzMElSbzlkcm4KWVg5T0ZGaXJMTTRwT0orY0pJaExJb1EyZXk2YnNwNGdpQnVGYlVYQ255T2dEQSs2cVNZMm5zR1R4TmdSam5wbgpWd28zc2tOaitjS21wUzdEbkpFeGZuL25jZDJrR0pOQXBHa1gzSDR2dXd0dUIrMnhQR21nL1U0QWdSeDZxKzErCm1rZGNIMFFWdW9tQ2FJUTFxRzMybTgxaG8xWTBlWlpMbVUycmVtNThqSkNUU0xEMkVHKzd3WTVDMkRETWlNRG0KSGhhOGoyTjdMUWJmVERwZVd4Z0lxVjlHWUl6cGc1MUtLcW1wVEFDOXkwRFZkbzlYNGlIZDFjYkNUTkFhNGtGQwpNUUkwK1BQT0hhVWRoUzE3S2h6dmwzSm11bTkvMWtyNWdCMmd2ajNXUHdMSzZxMzRZWmExdXVnc1ZkOHpzQ001CjlaWHNFUlhiam5neGpJWUJocUMzV2N3bXprNjRPK0ZjM1JKby80K2x3eFhaNXlTNCtMV25mMDNkblVKdzRIZVoKWldGZUdFdSsvMzNMSlhjQUVRRUFBYlFrVFdGMGRHaGxkeUJCY201dmJHUWdQRzFoZEhSaGNtNXZRSFZyTG1saQpiUzVqYjIwK2lRSFVCQk1CQ2dBK0ZpRUVYYjRnM3Q0azJPcmVyb3d2aGt0NFRPWmhKUFlGQW1Ud2MzRUNHd01GCkNRUENad0FGQ3drSUJ3SUdGUW9KQ0FzQ0JCWUNBd0VDSGdFQ0Y0QUFDZ2tRaGt0NFRPWmhKUGJWend3QXFDZUwKd2hzL3h0ek1uSG9aMk5BZys0TTl5elQ3RVZTOUo3MDgxTmFHdjFBckQvUEtUcTNQcCtXbm5XK2VwMlNxUWkzSgp1cjUrWlNSZ1BDYmpVOFRpVGhFRXU0MzFONEZsZnhCOGdORWNtOXRYTFZLMDJFU2Y5VnloTGZmZ2wrbHRpa1AyCk1DaXBrdmVaUGN3MUtnZVNyUnc2a1FRcXFadEN1dlM2Vm9lbGxSTEdvV0hoaHpGYXRmblpnNDVEZ1k1ZVVxNXYKSmczUHlKSDB4Mkhqa1Z4K0Q3QWRZSDRhT29oNGJhd2JXcHQrRERWZjBoUEJFZEtlR0ZGZEQ4OW1FSExDRnNCOQplTUF2cDU2ZDZxTUV5a0VWQ3dYMnVwQmhzc1RQdDBvdEZheFh2WGNJZXZLL05uOXNlbFozNWZETmVlaDZyMHduCm8rV3VURjBmWXNqN2k2MlZxa0hZZkR1eHhjZ09qY1RLeE5pTVB1eWNSOTJuZUdmVzVkK3FBaDQ5bDRrZVgxU0sKSTVDTi9ITFJwS1NjMUVaRDBVYXZjbjFLOHZ6NHVVRTBBbVM5dVB4OVdJMExoSkZiYlBseGNma2dBVFBhQUtrZQo5ZFc0VGZScVoycHFWQzB3dXdXck1nQVA1blJ0eWNqb1d3U3IxcXY1NDNqSkJEait4aGIwTmFLaUQ1Rnd1UUdOCkJHVHdjM0VCREFEU3I3K2RWcUdkS1R2dDV5Mi9oZzVHYkRKZlh4UUFqM0VnZmNvUXMzUWJkdDBmbVkwb0xGTXkKekpiS1BwTTRhS3dZdXE4YmszQkpMKyszUUZOU0tmd09IVEJBYWZWQWttVk5MU1NkN3hTNm1LTlUxcUZva2x2agp6U0VsRnVhVFhWUmlma01nWkdMS1NubExYOVlUN0xGb2piTGF5OHBEWFFreDFxSjN0SFBURTk5L00xN3J6MTlICkpEdnhkcnRTcXZldkRleVA3OGMvZTFpKzZ1bnEwaU1lUHZlNXN4WVA4RXRmcHJzeEYvQldBaEQ2ZnVHbnBhcXQKZGRSR0FEcnhQaFBrMCtLTGtSM1NxZGdjTGlyRWN5UEpyR3lwdlBDemNmTjZ6OVZOdk55M1BaYWs5UXB0OTBGbQprR2hUM1lCbjZnOFpBdTRZcVMzeEtWcTB6dzhVbXdra2VFTkNydU9rTG41Rk83SnRQdkVjN1J0amtSZW00d2dtCklORXJ4NU9zTzJUM2Z1QktXVklpOGpOdjBQYWowZk9VTHgxSzFtVzFSbVpIMmRHa0xTWmJzYXJxV1gwSW04MjMKeEsvdzFWN3owRXZuNHcraXZUVDUzQ29XMldNNndZTlY1TStFV2FMZjBHVmRCRDhZVlRkdGhwZlZwQjdvM2ZlWgpBelk4TkdHVWtUY0FFUUVBQVlrQnZBUVlBUW9BSmhZaEJGMitJTjdlSk5qcTNxNk1MNFpMZUV6bVlTVDJCUUprCjhITnhBaHNNQlFrRHdtY0FBQW9KRUlaTGVFem1ZU1QyS0NFTUFOY2NLQVJUSWdvcHBHTTBmNktsK2RNQ1cyd2UKcWFCdkNESzhvTUhJdDBMTWpMbDJvMEczZDI2Q0ZpaXVFazJlS0lFWkxDUjhyWFhXK2FBVmxsZHo2RzZMSThUZgpTUTA2c3R5dXROQTFNNmUyY1NxU0FRWWVOYXVwdkRaM0Y3a0M4WnEzeEYzOEZ0ckhHUHRrT0NwS0lxbzJ3THUrCloyTjZzait4cW1lMTA4aWFkc3hXbEc4K0lIR0FuWEtPcjZiOHpULzRGZVdXVCsxcnpDY01nREgwS3BkSkZ6OC8KTEZrQUsvTWYyQWlwUGltUU0rblJvT2grNlhwWExuNjlqSmNXREY4Wmw1YXNyL3pmZUtVWUNEUi9RRGpEblFMdwo3ekdETi81REtPSmNBcmlqN2lyU3FISkhRRW5xaDllOFdWUFJMTzBMcENsa2xwUlhmUk1lSVdJTnNkQVgxeEpWCkZVUUt1dUFoWkVwOWZFWmdlaVFadVZreFlYa0ptTWwrYzg0K2pBSkVjNmRjOVhIUTFxd0lSQUgvOTdScitzYXMKZFNOTUtuSkM1dGdFb0tINWloeklVcnZjV0tTcnNkaHdkcmovSDF6QTN0WmNSN3VLeVp6TEorZ05VeElDTUppeAp3djNVdUkzNUU2QkdCTWlySXcwL3UzbS8rdHZDTkFuWmE4YitjQT09Cj1ocjVvCi0tLS0tRU5EIFBHUCBQVUJMSUMgS0VZIEJMT0NLLS0tLS0K",
   "default/cosign-public-key/test": "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUZrd0V3WUhLb1pJemowQ0FRWUlLb1pJemowREFRY0RRZ0FFMWdIR2JmazFBcU93ZUxFTThIZlQwYm1mUUUzYgo5ZmNwL0xVNzVGTWZ4VlpYbU5WdFVwcnNITTF0aHV1aUJLT29mdjhLVjdUckZsNHA4TkpDaVhVa2hBPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCg==",

diff --git a/image-rs/tests/signature_verification.rs b/image-rs/tests/signature_verification.rs
@@ -92,13 +92,13 @@ const _TESTS_XRSS: [_TestItem; _TEST_ITEMS_XRSS] = [
         description: "Deny pulling an unencrypted signed image with no local sigstore and a registry that does not support the X-R-S-S API extension",
     },
     _TestItem {
-        image_ref: "uk.icr.io/mattarno_image_push/busybox:signed-latest",
+        image_ref: "uk.icr.io/kata-containers/busybox:signed-latest",
         allow: true,
         signing_scheme: SigningName::SimpleSigning,
         description: "Allow pulling an unencrypted signed image from a protected registry that supports the X-R-S-S API extension with no local sigstore",
     },
     _TestItem {
-        image_ref: "uk.icr.io/mattarno_image_push/busybox:unsigned-1.35",
+        image_ref: "uk.icr.io/kata-containers/busybox:unsigned-1.35",
         allow: false,
         signing_scheme: SigningName::SimpleSigning,
         description: "Deny pulling an unencrypted and unsigned image from a protected registry that supports the X-R-S-S API extension with no local sigstore",