Skip to content

Commit ca30d99

Browse files
akurinnoyakurinnoy
committed
fixup! fixup! fixup! fixup! fixup! fixup! fixup! chore: push base image to registry; update smoke tests to pull images
Signed-off-by: Oleksii Kurinnyi <[email protected]>
1 parent bc78894 commit ca30d99

File tree

2 files changed

+62
-0
lines changed

2 files changed

+62
-0
lines changed

‎.github/workflows/pr-check-ubi10.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@ jobs:
6161
--no-cache \
6262
--push \
6363
-t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} .
64+
- name: Verify base image is available (UBI10)
65+
run: |
66+
echo "Verifying base image is available in registry..."
67+
for i in {1..5}; do
68+
if docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} >/dev/null 2>&1; then
69+
echo "Base image is available!"
70+
exit 0
71+
fi
72+
echo "Waiting for image to be available... ($i/5)"
73+
sleep 10
74+
done
75+
echo "ERROR: Base image not available after 5 attempts"
76+
exit 1
6477
- name: Display docker images
6578
run: docker images
6679

@@ -97,6 +110,14 @@ jobs:
97110
registry: ${{ env.REGISTRY }}
98111
username: ${{ secrets.QUAY_USERNAME }}
99112
password: ${{ secrets.QUAY_PASSWORD }}
113+
- name: Verify base image exists before UDI build (UDI10)
114+
run: |
115+
echo "Verifying base image exists in registry..."
116+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} || {
117+
echo "ERROR: Base image not found: ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}}"
118+
exit 1
119+
}
120+
echo "Base image verified successfully!"
100121
- name: Update UDI Dockerfile (UDI10)
101122
run: sed "s|quay.io/devfile/base-developer-image:ubi10-latest|${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}}|" -i "universal/ubi10/Dockerfile"
102123
- name: Add expiration label to UDI Dockerfile (UDI10)
@@ -129,6 +150,16 @@ jobs:
129150
echo "=========================================="
130151
echo "Publishing UBI10 base image manifest"
131152
echo "=========================================="
153+
echo "Verifying both architecture images exist..."
154+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} || {
155+
echo "ERROR: amd64 base image not found"
156+
exit 1
157+
}
158+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}} || {
159+
echo "ERROR: arm64 base image not found"
160+
exit 1
161+
}
162+
echo "Both images verified, creating manifest..."
132163
docker manifest create ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
133164
--amend ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} \
134165
--amend ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}}

‎.github/workflows/pr-check.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,19 @@ jobs:
6161
--no-cache \
6262
--push \
6363
-t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} .
64+
- name: Verify base image is available (UBI9)
65+
run: |
66+
echo "Verifying base image is available in registry..."
67+
for i in {1..5}; do
68+
if docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} >/dev/null 2>&1; then
69+
echo "Base image is available!"
70+
exit 0
71+
fi
72+
echo "Waiting for image to be available... ($i/5)"
73+
sleep 10
74+
done
75+
echo "ERROR: Base image not available after 5 attempts"
76+
exit 1
6477
- name: Display docker images
6578
run: docker images
6679

@@ -96,6 +109,14 @@ jobs:
96109
registry: ${{ env.REGISTRY }}
97110
username: ${{ secrets.QUAY_USERNAME }}
98111
password: ${{ secrets.QUAY_PASSWORD }}
112+
- name: Verify base image exists before UDI build (UDI9)
113+
run: |
114+
echo "Verifying base image exists in registry..."
115+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} || {
116+
echo "ERROR: Base image not found: ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}}"
117+
exit 1
118+
}
119+
echo "Base image verified successfully!"
99120
- name: Update UDI Dockerfile (UDI9)
100121
run: sed "s|quay.io/devfile/base-developer-image:ubi9-latest|${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}}|" -i "universal/ubi9/Dockerfile"
101122
- name: Add expiration label to UDI Dockerfile (UDI9)
@@ -128,6 +149,16 @@ jobs:
128149
echo "=========================================="
129150
echo "Publishing UBI9 base image manifest"
130151
echo "=========================================="
152+
echo "Verifying both architecture images exist..."
153+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} || {
154+
echo "ERROR: amd64 base image not found"
155+
exit 1
156+
}
157+
docker manifest inspect ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}} || {
158+
echo "ERROR: arm64 base image not found"
159+
exit 1
160+
}
161+
echo "Both images verified, creating manifest..."
131162
docker manifest create ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
132163
--amend ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} \
133164
--amend ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}}

0 commit comments

Comments
 (0)