@@ -94,17 +94,16 @@ jobs:
9494
9595 create-multiarch-manifest :
9696 needs : [build-container]
97- if : github.event_name != 'pull_request'
9897 strategy :
9998 matrix :
10099 include :
101- - image_name : validatedpatterns/utility-container
100+ - image_name : validatedpatterns/utility-container-test
102101 username_secret : QUAY_USERNAME
103102 password_secret : QUAY_PASSWORD
104- - image_name : hybridcloudpatterns/utility-container
103+ - image_name : hybridcloudpatterns/utility-container-test
105104 username_secret : LEGACY_QUAY_USERNAME
106105 password_secret : LEGACY_QUAY_PASSWORD
107-
106+
108107 runs-on : ubuntu-latest
109108 permissions :
110109 contents : read
@@ -131,11 +130,11 @@ jobs:
131130 run : |
132131 docker load --input /tmp/image-amd64.tar
133132 docker load --input /tmp/image-arm64.tar
134-
133+
135134 # Retag loaded images for this specific repo
136135 OLD_IMAGE_BASE="${{ env.REGISTRY }}/${{ env.QUAY_IMAGE_NAME }}"
137136 NEW_IMAGE_BASE="${{ env.REGISTRY }}/${{ matrix.image_name }}"
138-
137+
139138 docker tag "${OLD_IMAGE_BASE}:build-${{ github.run_id }}-amd64" "${NEW_IMAGE_BASE}:build-${{ github.run_id }}-amd64"
140139 docker tag "${OLD_IMAGE_BASE}:build-${{ github.run_id }}-arm64" "${NEW_IMAGE_BASE}:build-${{ github.run_id }}-arm64"
141140
@@ -211,12 +210,12 @@ jobs:
211210 if : always()
212211 run : |
213212 IMAGE_BASE="${{ env.REGISTRY }}/${{ matrix.image_name }}"
214-
213+
215214 # Try to delete temporary images, ignore errors if they don't exist
216215 docker run --rm quay.io/skopeo/stable delete \
217216 --creds "${{ secrets[matrix.username_secret] }}:${{ secrets[matrix.password_secret] }}" \
218217 docker://"${IMAGE_BASE}:build-${{ github.run_id }}-amd64" || true
219-
218+
220219 docker run --rm quay.io/skopeo/stable delete \
221220 --creds "${{ secrets[matrix.username_secret] }}:${{ secrets[matrix.password_secret] }}" \
222221 docker://"${IMAGE_BASE}:build-${{ github.run_id }}-arm64" || true
0 commit comments