Move build to separate job in main int test (#1320)

* Move build to separate job as it uses a reusable workflow * Add name for job
kyma-project · Sep 28, 2024 · 3c67483 · 3c67483
1 parent a9b4434
commit 3c67483
Showing 1 changed file with 26 additions and 23 deletions.
diff --git a/.github/workflows/main-integration.yaml b/.github/workflows/main-integration.yaml
@@ -22,20 +22,23 @@ on:
 
 jobs:
   build:
+    name: build api-gateway image
+    uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main
+    if: ${{ github.event_name != 'schedule' }}
+    with:
+      name: api-gateway-manager
+      dockerfile: Dockerfile
+      context: .
+      build-args: |
+        VERSION=${{ github.sha }}
+      tags: "${{ github.sha }}"
+
+  get-sha:
+    name: Get SHA
     runs-on: ubuntu-latest
     outputs:
       sha: ${{ steps.get-sha.outputs.sha }}
     steps:
-      - name: build api-gateway image
-        uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main
-        if: ${{ github.event_name != 'schedule' }}
-        with:
-          name: api-gateway-manager
-          dockerfile: Dockerfile
-          context: .
-          build-args: |
-            VERSION=${{ github.sha }}
-            tags: "${{ github.sha }}"
       - name: Get SHA from latest run of main integration triggered by push
         id: get-latest-push-sha
         uses: actions/github-script@v6
@@ -62,31 +65,31 @@ jobs:
       - name: Set output SHA
         id: get-sha
         run: |
-          if [ "${{ github.event_name }}" != "schedule" ]; then
-            echo "sha=${{ github.sha }}" >> $GITHUB_OUTPUT
-          else
+          if [ "${{ github.event_name }}" == "schedule" ]; then
             echo "sha=${{ steps.get-latest-push-sha.outputs.sha }}" >> $GITHUB_OUTPUT
+          else
+            echo "sha=${{ github.sha }}" >> $GITHUB_OUTPUT
           fi
 
   integration-tests:
     name: Integration tests
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, get-sha]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/integration-tests
         with:
-          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.build.outputs.sha }}"
+          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.get-sha.outputs.sha }}"
           client_id: ${{ secrets.CLIENT_ID }}
           client_secret: ${{ secrets.CLIENT_SECRET }}
           oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
 
   migration-downtime-tests:
     name: Zero Downtime Migration Tests
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, get-sha]
     strategy:
       fail-fast: false
       matrix:
@@ -97,20 +100,20 @@ jobs:
           fetch-depth: 0
       - uses: ./.github/actions/integration-tests
         with:
-          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.build.outputs.sha }}"
+          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.get-sha.outputs.sha }}"
           test_make_target: ${{ matrix.test_make_target }}
 
   upgrade-tests:
     name: Upgrade tests
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, get-sha]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/upgrade-test
         with:
-          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.build.outputs.sha }}"
+          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.get-sha.outputs.sha }}"
           client_id: ${{ secrets.CLIENT_ID }}
           client_secret: ${{ secrets.CLIENT_SECRET }}
           oidc_well_known_url: "${{ secrets.OIDC_ISSUER_URL }}/.well-known/openid-configuration"
@@ -119,15 +122,15 @@ jobs:
   custom-domain-integration-gcp:
     name: Custom domain integration GCP
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, get-sha]
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
       - uses: ./.github/actions/integration-test-gardener
         with:
-          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.build.outputs.sha }}"
+          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.get-sha.outputs.sha }}"
           gardener_secret: ${{ secrets.GARDENER_TOKEN }}
           script: ./hack/ci/custom-domain-gardener-gcp.sh
           client_id: ${{ secrets.CLIENT_ID }}
@@ -138,15 +141,15 @@ jobs:
   custom-domain-integration-aws:
     name: Custom domain integration AWS
     runs-on: ubuntu-latest
-    needs: [build]
+    needs: [build, get-sha]
     steps:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
       - uses: ./.github/actions/integration-test-gardener
         with:
-          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.build.outputs.sha }}"
+          manager_image: "europe-docker.pkg.dev/kyma-project/prod/api-gateway-manager:${{ needs.get-sha.outputs.sha }}"
           gardener_secret: ${{ secrets.GARDENER_TOKEN }}
           script: ./hack/ci/custom-domain-gardener-aws.sh
           client_id: ${{ secrets.CLIENT_ID }}