Reintroduced build test iamge

smartcontractkit · Jun 5, 2024 · 7705e07 · 7705e07
1 parent d93fc9d
commit 7705e07
Showing 1 changed file with 11 additions and 28 deletions.
diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml
@@ -124,51 +124,34 @@ jobs:
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
-  solana-build-test-image:
+  build_test_image:
     environment: integration
     permissions:
-      checks: write
-      pull-requests: write
       id-token: write
       contents: read
-    name: Solana Build Test Image
-    runs-on: ubuntu22.04-16cores-64GB
-    needs:
-      [
-        e2e_custom_build_artifacts,
-        solana-test-image-exists,
-      ]
-    env:
-      CONTRACT_ARTIFACTS_PATH: contracts/target/deploy
+    name: Build Test Image
+    runs-on: ubuntu-latest
+    needs: [e2e_custom_build_artifacts]
     steps:
       - name: Collect Metrics
-        if: (needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch') && needs.solana-test-image-exists.outputs.exists == 'false'
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
+        uses: smartcontractkit/push-gha-metrics-action@v1
         with:
-          id: ${{ env.COLLECTION_ID }}-solana-build-test-image
-          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Solana Build Test Image
+          basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
+          this-job-name: Build Test Image
         continue-on-error: true
       - name: Checkout the repo
-        if: (needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch') && needs.solana-test-image-exists.outputs.exists == 'false'
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
-          repository: smartcontractkit/chainlink-solana
-          ref: ${{ github.sha }}
-      - name: Build Test Image
-        if: (needs.changes.outputs.src == 'true' || github.event_name == 'workflow_dispatch') && needs.solana-test-image-exists.outputs.exists == 'false'
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: Build Image
         uses: ./.github/actions/build-test-image
         with:
-          tag: ${{ github.sha }}
           artifacts_path: ${{ env.CONTRACT_ARTIFACTS_PATH }}
           QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
           QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
-      - run: echo "this exists so we don't have to run anything else if the build is skipped"
-        if: needs.changes.outputs.src == 'false' || needs.solana-test-image-exists.outputs.exists == 'true'
 
   e2e_custom_run_smoke_tests:
     name: E2E Custom Run Smoke Tests