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

akurinnoy · akurinnoy · commit 6e70d3743392 · 2025-12-17T15:08:54.000+02:00
Signed-off-by: Oleksii Kurinnyi &lt;okurinny@redhat.com&gt;
diff --git a/.github/workflows/empty-worksapce-smoke-test-on-minikube-ubi10.yaml b/.github/workflows/empty-worksapce-smoke-test-on-minikube-ubi10.yaml
@@ -12,11 +12,12 @@
 
 name: Empty workspace smoke test on udi10
 on:
-  pull_request:
-    paths-ignore:
-      - '**/*.md'
-      - .devfile.yaml
-      - LICENSE
+  workflow_run:
+    workflows: ["Pull Request Check UBI 10"]
+    types:
+      - completed
+    branches:
+      - '**'
 
 env:
   # Use repository variable if set, otherwise fallback to default registry
@@ -28,6 +29,7 @@ env:
 
 jobs:
   workspace-api-tests-on-minikube:
+    if: github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
@@ -40,11 +42,17 @@ jobs:
     - name: Free runner space
       run: |
         sudo rm -rf /usr/local/lib/android
-      # obtain the PR number for tagging the image
     - name: Get PR number
       id: get_pr_number
       run: |
-        pr_number=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
+        pr_number="${{ github.event.workflow_run.pull_requests[0].number }}"
+        if [ -z "$pr_number" ] || [ "$pr_number" == "null" ]; then
+          pr_number=$(echo "${{ github.event.workflow_run.head_branch }}" | grep -oE '[0-9]+' | head -1 || echo "")
+        fi
+        if [ -z "$pr_number" ]; then
+          echo "Error: Could not extract PR number from workflow_run event"
+          exit 1
+        fi
         echo "PR_NUMBER=$pr_number" >> $GITHUB_ENV
         echo ">>>>>>>>>>>$pr_number"
 
@@ -67,18 +75,18 @@ jobs:
         install minikube-linux-${{env.arch}} /usr/local/bin/minikube && rm minikube-linux-${{env.arch}}
         minikube start --vm-driver=docker --addons=ingress --cpus 2 --memory 6500
 
-    # connect with docker daemon in the minikube and build an image there
-    # we need to build the image in the minikube because we have just 14 GB of space on the runner
-    # the UBI have more than 9 GB size this approach saves the disk space
-    - name: Build base image
-      run: |
-        eval $(minikube docker-env)
-        cd base/ubi10 && docker build -t ${{ env.REGISTRY }}/base-developer-image:ubi10-latest .
+    - name: Login to Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_PASSWORD }}
 
-    - name: Build universal image
+    - name: Pull UDI image into minikube
       run: |
         eval $(minikube docker-env)
-        cd universal/ubi10 && docker build -t ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{ env.PR_NUMBER }} .
+        docker pull ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-ubi10-pr-${{ env.PR_NUMBER }}
+        docker tag ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-ubi10-pr-${{ env.PR_NUMBER }} ${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{ env.PR_NUMBER }}
 
     - name: Checkout DWO
       uses: actions/checkout@master
@@ -105,8 +113,6 @@ jobs:
 
     - name: Check that UDI is present in the image list
       run: |
-        # we used it for the build above and do not need it anymore. It saves the disk space
-        minikube image rm ${{ env.REGISTRY }}/base-developer-image:ubi10-latest
         minikube image list --format table
 
     - name: Install NodeJs
diff --git a/.github/workflows/empty-worksapce-smoke-test-on-minikube-ubi9.yaml b/.github/workflows/empty-worksapce-smoke-test-on-minikube-ubi9.yaml
@@ -12,11 +12,12 @@
 
 name: Empty workspace smoke test on udi9
 on:
-  pull_request:
-    paths-ignore:
-      - '**/*.md'
-      - .devfile.yaml
-      - LICENSE
+  workflow_run:
+    workflows: ["Pull Request Check"]
+    types:
+      - completed
+    branches:
+      - '**'
 
 env:
   # Use repository variable if set, otherwise fallback to default registry
@@ -28,6 +29,7 @@ env:
 
 jobs:
   workspace-api-tests-on-minikube:
+    if: github.event.workflow_run.conclusion == 'success'
     strategy:
       fail-fast: false
       matrix:
@@ -40,11 +42,17 @@ jobs:
     - name: Free runner space
       run: |
         sudo rm -rf /usr/local/lib/android
-      # obtain the PR number for tagging the image
     - name: Get PR number
       id: get_pr_number
       run: |
-        pr_number=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
+        pr_number="${{ github.event.workflow_run.pull_requests[0].number }}"
+        if [ -z "$pr_number" ] || [ "$pr_number" == "null" ]; then
+          pr_number=$(echo "${{ github.event.workflow_run.head_branch }}" | grep -oE '[0-9]+' | head -1 || echo "")
+        fi
+        if [ -z "$pr_number" ]; then
+          echo "Error: Could not extract PR number from workflow_run event"
+          exit 1
+        fi
         echo "PR_NUMBER=$pr_number" >> $GITHUB_ENV
         echo ">>>>>>>>>>>$pr_number"
 
@@ -67,18 +75,18 @@ jobs:
         install minikube-linux-${{env.arch}} /usr/local/bin/minikube && rm minikube-linux-${{env.arch}}
         minikube start --vm-driver=docker --addons=ingress --cpus 2 --memory 6500
 
-    # connect with docker daemon in the minikube and build an image there
-    # we need to build the image in the minikube because we have just 14 GB of space on the runner
-    # the UBI have more than 9 GB size this approach saves the disk space
-    - name: Build base image
-      run: |
-        eval $(minikube docker-env)
-        cd base/ubi9 && docker build -t ${{ env.REGISTRY }}/base-developer-image:ubi9-latest .
+    - name: Login to Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ env.REGISTRY }}
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_PASSWORD }}
 
-    - name: Build universal image
+    - name: Pull UDI image into minikube
       run: |
         eval $(minikube docker-env)
-        cd universal/ubi9 && docker build -t ${{ env.REGISTRY }}/universal-developer-image:ubi9-pr-${{ env.PR_NUMBER }} .
+        docker pull ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-pr-${{ env.PR_NUMBER }}
+        docker tag ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-pr-${{ env.PR_NUMBER }} ${{ env.REGISTRY }}/universal-developer-image:ubi9-pr-${{ env.PR_NUMBER }}
 
     - name: Checkout DWO
       uses: actions/checkout@master
@@ -105,8 +113,6 @@ jobs:
 
     - name: Check that UDI is present in the image list
       run: |
-        # we used it for the build above and do not need it anymore. It saves the disk space
-        minikube image rm ${{ env.REGISTRY }}/base-developer-image:ubi9-latest
         minikube image list --format table
 
     - name: Install NodeJs
diff --git a/.github/workflows/pr-check-ubi10.yaml b/.github/workflows/pr-check-ubi10.yaml
@@ -38,20 +38,24 @@ jobs:
         run: sudo rm -rf /usr/local/lib/android
       - name: Cleanup docker images
         run: docker system prune -af
+      - name: Add expiration label to base Dockerfile
+        run: sed -i '/^FROM/a LABEL quay.expires-after=4w' base/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 base image
         run: |
             cd base/ubi10 && docker buildx build \
             --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}} .
       - name: Display docker images
         run: docker images
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
       - 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
@@ -97,6 +101,8 @@ jobs:
         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:
@@ -111,6 +117,32 @@ jobs:
             --push \
             -t ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-ubi10-pr-${{github.event.number}} .
 
+  publish-base-image:
+    name: Publish base image
+    runs-on: ubuntu-22.04
+    needs: build-base-image
+    steps:
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: publish
+        run: |
+          docker manifest create ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
+            --amend ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} \
+            --amend ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}}
+          
+          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:amd64-ubi10-pr-${{github.event.number}} \
+            --os linux --arch amd64
+          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:arm64-ubi10-pr-${{github.event.number}} \
+            --os linux --arch arm64
+          
+          docker manifest push ${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}}
+
   publish-udi:
     name: Publish udi
     runs-on: ubuntu-22.04
@@ -145,5 +177,5 @@ jobs:
                issue_number: ${{github.event.number}},
                owner: context.repo.owner,
                repo: context.repo.repo,
-               body: `Pull Request UBI 10 images published ✨\n\nUDI: [${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}}](https://${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}})`
+               body: `Pull Request UBI 10 images published ✨\n\nBase: [${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}}](https://${{ env.REGISTRY }}/base-developer-image:ubi10-pr-${{github.event.number}})\nUDI: [${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}}](https://${{ env.REGISTRY }}/universal-developer-image:ubi10-pr-${{github.event.number}})`
              })
diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml
@@ -38,11 +38,21 @@ jobs:
         run: sudo rm -rf /usr/local/lib/android
       - name: Cleanup docker images
         run: docker system prune -af
+      - name: Add expiration label to base Dockerfile
+        run: sed -i '/^FROM/a LABEL quay.expires-after=4w' base/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 base image
         run: |
             cd base/ubi9 && docker buildx build \
             --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}} .
       - name: Display docker images
         run: docker images
@@ -90,6 +100,8 @@ jobs:
         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:
@@ -104,6 +116,32 @@ jobs:
             --push \
             -t ${{ env.REGISTRY }}/universal-developer-image:${{env.arch}}-pr-${{github.event.number}} .
 
+  publish-base-image:
+    name: Publish base image
+    runs-on: ubuntu-22.04
+    needs: build-base-image
+    steps:
+      - name: Login to Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_PASSWORD }}
+      - name: publish
+        run: |
+          docker manifest create ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
+            --amend ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} \
+            --amend ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}}
+          
+          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:amd64-pr-${{github.event.number}} \
+            --os linux --arch amd64
+          docker manifest annotate ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}} \
+            ${{ env.REGISTRY }}/base-developer-image:arm64-pr-${{github.event.number}} \
+            --os linux --arch arm64
+          
+          docker manifest push ${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}}
+
   publish-udi:
     name: Publish udi
     runs-on: ubuntu-22.04
@@ -138,5 +176,5 @@ jobs:
                issue_number: ${{github.event.number}},
                owner: context.repo.owner,
                repo: context.repo.repo,
-               body: `Pull Request images published ✨\n\nUDI: [${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}}](https://${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}})`
+               body: `Pull Request images published ✨\n\nBase: [${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}}](https://${{ env.REGISTRY }}/base-developer-image:pr-${{github.event.number}})\nUDI: [${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}}](https://${{ env.REGISTRY }}/universal-developer-image:pr-${{github.event.number}})`
              })
