fix tests, upgrade skopeo add --preserve-digests on copy

dataaxiom · Nov 30, 2024 · 03108f6 · 03108f6
1 parent eab90af
commit 03108f6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   general-tests:
     name: General Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
 
   integration-tests:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: general-tests
 
     strategy:
@@ -317,7 +317,7 @@ jobs:
 
   github-attestation-tests:
     name: Github Referrer/Attestation Tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       REGISTRY: ghcr.io
     needs: integration-tests
@@ -429,7 +429,7 @@ jobs:
   cosign-test:
     name: Cosign Test
     needs: github-attestation-tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -489,7 +489,7 @@ jobs:
 
   multi-package-cleanup:
     name: Cleanup Multiple Packages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: cosign-test
 
     steps:
@@ -507,7 +507,7 @@ jobs:
 
   shared-image-tagged-test:
     name: Shared Images Tagged Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: multi-package-cleanup
 
     steps:
@@ -564,7 +564,7 @@ jobs:
 
   shared-image-untagged-test:
     name: Shared Images Untagged Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: shared-image-tagged-test
 
     steps:
@@ -620,7 +620,7 @@ jobs:
 
   multi-package-cleanup-regex:
     name: Cleanup Multiple Packages - Regex
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: shared-image-untagged-test
     env:
       GHCR_PAT: ${{secrets.GHCR_PAT}}

diff --git a/citester/index.js b/citester/index.js
@@ -37195,7 +37195,8 @@ function pushImage(srcImage, destImage, extraArgs, token) {
         'copy',
         `docker://${srcImage}`,
         `docker://${destImage}`,
-        `--dest-creds=token:${token}`
+        `--dest-creds=token:${token}`,
+        '--preserve-digests'
     ];
     if (extraArgs) {
         const parts = extraArgs.split(' ');

diff --git a/citester/index.js.map b/citester/index.js.map
diff --git a/src/ci-tester.ts b/src/ci-tester.ts
@@ -40,7 +40,8 @@ function pushImage(
     'copy',
     `docker://${srcImage}`,
     `docker://${destImage}`,
-    `--dest-creds=token:${token}`
+    `--dest-creds=token:${token}`,
+    '--preserve-digests'
   ]
   if (extraArgs) {
     const parts = extraArgs.split(' ')