Testing ACR login#7

vpidatala94 · Feb 16, 2025 · 5bc712f · 5bc712f
1 parent e8f56c2
commit 5bc712f
Showing 1 changed file with 31 additions and 74 deletions.
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -45,20 +45,12 @@ jobs:
         run: |
           set -euo pipefail
           echo "TAG=$(make version)" >> $GITHUB_ENV
-          if [ "$IS_MERGE_GROUP" == "true" ]; then
-            az acr login -n ${{ vars.ACR_NAME }}
-            make retina-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
-              BUILDX_ACTION=--push
-          else
-            make retina-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}
-          fi
-        env:
-          IS_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
+          az acr login -n ${{ vars.ACR_NAME }}
+          make retina-image \
+            IMAGE_NAMESPACE=${{ github.repository }} \
+            PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+            IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
+            BUILDX_ACTION=--push
 
   retina-win-images:
     name: Build Agent Windows Images
@@ -95,22 +87,12 @@ jobs:
           set -euo pipefail
           echo "TAG=$(make version)" >> $GITHUB_ENV
           az acr login -n ${{ vars.ACR_NAME }}
-          if [ "$IS_MERGE_GROUP" == "true" ]; then
-            make retina-image-win \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
-              WINDOWS_YEARS=${{ matrix.year }} \
-              BUILDX_ACTION=--push
-          else
-            make retina-image-win \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              WINDOWS_YEARS=${{ matrix.year }}
-              BUILDX_ACTION=--push
-          fi
-        env:
-          IS_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
+          make retina-image-win \
+            IMAGE_NAMESPACE=${{ github.repository }} \
+            PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+            IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
+            WINDOWS_YEARS=${{ matrix.year }} \
+            BUILDX_ACTION=--push
 
   operator-images:
     name: Build Operator Images
@@ -145,20 +127,12 @@ jobs:
         run: |
           set -euo pipefail
           echo "TAG=$(make version)" >> $GITHUB_ENV
-          if [ "$IS_MERGE_GROUP" == "true" ]; then
-            az acr login -n ${{ vars.ACR_NAME }}
-            make retina-operator-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              IMAGE_REGISTRY=${{ vars.ACR_NAME }} \
-              BUILDX_ACTION=--push
-          else
-            make retina-operator-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}
-          fi
-        env:
-          IS_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
+          az acr login -n ${{ vars.ACR_NAME }}
+          make retina-operator-image \
+            IMAGE_NAMESPACE=${{ github.repository }} \
+            PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+            IMAGE_REGISTRY=${{ vars.ACR_NAME }} \
+            BUILDX_ACTION=--push
 
   retina-shell-images:
     name: Build Retina Shell Images
@@ -193,20 +167,12 @@ jobs:
         run: |
           set -euo pipefail
           echo "TAG=$(make version)" >> $GITHUB_ENV
-          if [ "$IS_MERGE_GROUP" == "true" ]; then
-            az acr login -n ${{ vars.ACR_NAME }}
-            make retina-shell-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
-              BUILDX_ACTION=--push
-          else
-            make retina-shell-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}
-          fi
-        env:
-          IS_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
+          az acr login -n ${{ vars.ACR_NAME }}
+          make retina-shell-image \
+            IMAGE_NAMESPACE=${{ github.repository }} \
+            PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+            IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
+            BUILDX_ACTION=--push
 
   kubectl-retina-images:
     name: Build Kubectl Retina Images
@@ -231,7 +197,6 @@ jobs:
 
       - name: Az CLI login
         uses: azure/login@v2
-        if: ${{ github.event_name != 'merge_group' }}
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -242,20 +207,12 @@ jobs:
         run: |
           set -euo pipefail
           echo "TAG=$(make version)" >> $GITHUB_ENV
-          if [ "$IS_MERGE_GROUP" == "true" ]; then
-            az acr login -n ${{ vars.ACR_NAME }}
-            make kubectl-retina-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
-              IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
-              BUILDX_ACTION=--push
-          else
-            make kubectl-retina-image \
-              IMAGE_NAMESPACE=${{ github.repository }} \
-              PLATFORM=${{ matrix.platform }}/${{ matrix.arch }}
-          fi
-        env:
-          IS_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
+          az acr login -n ${{ vars.ACR_NAME }}
+          make kubectl-retina-image \
+            IMAGE_NAMESPACE=${{ github.repository }} \
+            PLATFORM=${{ matrix.platform }}/${{ matrix.arch }} \
+            IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
+            BUILDX_ACTION=--push
 
   manifests:
     if: ${{ success('retina-images') && success('retina-win-images') && success('operator-images') && success('retina-shell-images')}}
@@ -297,6 +254,7 @@ jobs:
           IMAGE_REGISTRY=${{ vars.ACR_NAME }}  \
 
   e2e:
+    if: ${{ success('manifests')}}
     name: Run E2E Tests
     runs-on: ubuntu-latest
     needs: [manifests]
@@ -313,7 +271,6 @@ jobs:
 
       - name: Az CLI login
         uses: azure/login@v2
-        if: ${{ github.event_name != 'merge_group' }}
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}