fixup! chore: push base image to registry; update smoke tests to pull images

Signed-off-by: Oleksii Kurinnyi <[email protected]>

Author: akurinnoy

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

@@ -52,17 +52,9 @@ jobs:
             --platform linux/${{env.arch}} \
             --progress=plain \
             --push \
-            -t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} \
-            -t base-developer-image-${{env.arch}} .
+            -t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} .
       - name: Display docker images
         run: docker images
-      - name: Compress image to a file
-        run: docker save base-developer-image-${{env.arch}} | gzip > base-developer-image-${{env.arch}}.tgz
-      - name: Upload image artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: base-developer-image-${{env.arch}}
-          path: base-developer-image-${{env.arch}}.tgz
 
 
   build-udi:
@@ -87,28 +79,22 @@ jobs:
         run: sudo rm -rf /usr/local/lib/android
       - name: Cleanup docker images
         run: docker system prune -af
-      - name: Download BDI artifacts
-        uses: actions/download-artifact@v4
+      - name: Login to Registry
+        uses: docker/login-action@v3
         with:
-          pattern: base-developer-image-*
-          merge-multiple: true
-          path: .
-      - name: List downloaded files
-        run: ls -lah
-      - name: Load docker images
-        run: docker load -i base-developer-image-${{env.arch}}.tgz
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Pull base image
+        run: |
+          docker pull ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}}
+          docker tag ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} base-developer-image-${{env.arch}}
       - name: Display docker images
         run: docker images
       - name: Update UDI Dockerfile
         run: sed "s|quay.io/devfile/base-developer-image:ubi10-latest|base-developer-image-${{env.arch}}|" -i "universal/ubi10/Dockerfile"
       - name: Add expiration label to UDI Dockerfile
         run: sed -i '/^FROM/a LABEL quay.expires-after=4w' universal/ubi10/Dockerfile
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
       - name: Build udi
         run: |
           cd universal/ubi10 && docker buildx build \

.github/workflows/pr-check.yaml

@@ -52,17 +52,9 @@ jobs:
             --platform linux/${{env.arch}} \
             --progress=plain \
             --push \
-            -t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} \
-            -t base-developer-image-${{env.arch}} .
+            -t ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} .
       - name: Display docker images
         run: docker images
-      - name: Compress image to a file
-        run: docker save base-developer-image-${{env.arch}} | gzip > base-developer-image-${{env.arch}}.tgz
-      - name: Upload image artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: base-developer-image-${{env.arch}}
-          path: base-developer-image-${{env.arch}}.tgz
 
   build-udi:
     name: Build udi
@@ -86,28 +78,22 @@ jobs:
         run: sudo rm -rf /usr/local/lib/android
       - name: Cleanup docker images
         run: docker system prune -af
-      - name: Download BDI artifacts
-        uses: actions/download-artifact@v4
+      - name: Login to Registry
+        uses: docker/login-action@v3
         with:
-          pattern: base-developer-image-*
-          merge-multiple: true
-          path: .
-      - name: List downloaded files
-        run: ls -lah
-      - name: Load docker images
-        run: docker load -i base-developer-image-${{env.arch}}.tgz
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: Pull base image
+        run: |
+          docker pull ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}}
+          docker tag ${{ env.REGISTRY }}/base-developer-image:${{env.arch}}-pr-${{github.event.number}} base-developer-image-${{env.arch}}
       - name: Display docker images
         run: docker images
       - name: Update UDI Dockerfile
         run: sed "s|quay.io/devfile/base-developer-image:ubi9-latest|base-developer-image-${{env.arch}}|" -i "universal/ubi9/Dockerfile"
       - name: Add expiration label to UDI Dockerfile
         run: sed -i '/^FROM/a LABEL quay.expires-after=4w' universal/ubi9/Dockerfile
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
       - name: Build udi
         run: |
           cd universal/ubi9 && docker buildx build \