From d33ddfc310bedaac4770b8e4f97dec574e257283 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Thu, 20 Feb 2025 16:58:59 +0100 Subject: [PATCH 1/4] try new reusable workflow --- .github/workflows/integration-tests.yml | 12 +++++------- .../tests/smoke/capabilities/workflow_test.go | 3 +++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 443df08f380..5eba32f26fc 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -183,7 +183,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && ( needs.changes.outputs.keystone_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd with: workflow_name: Run Core Workflow Engine Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -211,8 +211,6 @@ jobs: AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN: ${{ secrets.AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN }} AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }} SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }} - MAIN_DNS_ZONE_PUBLIC_SDLC: ${{ secrets.MAIN_DNS_ZONE_PUBLIC_SDLC }} - AWS_K8S_CLUSTER_NAME_SDLC: ${{ secrets.AWS_K8S_CLUSTER_NAME_SDLC }} OPTIONAL_GATI_AWS_ROLE_ARN: ${{ secrets.AWS_OIDC_GLOBAL_READ_ONLY_TOKEN_ISSUER_ROLE_ARN }} OPTIONAL_GATI_LAMBDA_URL: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }} @@ -226,7 +224,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd with: workflow_name: Run Core E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -267,7 +265,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'merge_group' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd with: workflow_name: Run Core E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -312,7 +310,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd with: workflow_name: Run CCIP E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -354,7 +352,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'merge_group' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@244b17ef5c6ddad3cc841ba90117304216d031f5 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd with: workflow_name: Run CCIP E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} diff --git a/system-tests/tests/smoke/capabilities/workflow_test.go b/system-tests/tests/smoke/capabilities/workflow_test.go index eeed08ff176..d917a975178 100644 --- a/system-tests/tests/smoke/capabilities/workflow_test.go +++ b/system-tests/tests/smoke/capabilities/workflow_test.go @@ -785,6 +785,9 @@ func TestKeystoneWithOCR3Workflow_SingleDon_MockedPrice(t *testing.T) { return !hasNextPrice }, timeout, 10*time.Second, "feed did not update, timeout after: %s", timeout) + testLogger.Error().Msg("failing on purpose") + t.FailNow() + require.EqualValues(t, priceProvider.ExpectedPrices(), priceProvider.ActualPrices(), "prices do not match") testLogger.Info().Msgf("All %d prices were found in the feed", len(priceProvider.ExpectedPrices())) } From 4814f1a59421e7823037514893b7fa0584708bbc Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Fri, 21 Feb 2025 10:10:14 +0100 Subject: [PATCH 2/4] remove on-purpose failure --- system-tests/tests/smoke/capabilities/workflow_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/system-tests/tests/smoke/capabilities/workflow_test.go b/system-tests/tests/smoke/capabilities/workflow_test.go index d917a975178..eeed08ff176 100644 --- a/system-tests/tests/smoke/capabilities/workflow_test.go +++ b/system-tests/tests/smoke/capabilities/workflow_test.go @@ -785,9 +785,6 @@ func TestKeystoneWithOCR3Workflow_SingleDon_MockedPrice(t *testing.T) { return !hasNextPrice }, timeout, 10*time.Second, "feed did not update, timeout after: %s", timeout) - testLogger.Error().Msg("failing on purpose") - t.FailNow() - require.EqualValues(t, priceProvider.ExpectedPrices(), priceProvider.ActualPrices(), "prices do not match") testLogger.Info().Msgf("All %d prices were found in the feed", len(priceProvider.ExpectedPrices())) } From 3b15d65c33486bdb38867cdd56797c92607d84c0 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Fri, 21 Feb 2025 13:30:20 +0100 Subject: [PATCH 3/4] use e2e reusable workflow commit from main .github branch --- .github/workflows/integration-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5eba32f26fc..7e557cdc815 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -183,7 +183,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && ( needs.changes.outputs.keystone_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@18ee2276811ff4ad56a2284590c9917bec33b748 with: workflow_name: Run Core Workflow Engine Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -224,7 +224,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@18ee2276811ff4ad56a2284590c9917bec33b748 with: workflow_name: Run Core E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -265,7 +265,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'merge_group' && ( needs.changes.outputs.core_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@18ee2276811ff4ad56a2284590c9917bec33b748 with: workflow_name: Run Core E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -310,7 +310,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'pull_request' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@18ee2276811ff4ad56a2284590c9917bec33b748 with: workflow_name: Run CCIP E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} @@ -352,7 +352,7 @@ jobs: contents: read needs: [build-chainlink, changes] if: github.event_name == 'merge_group' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true') - uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@8f9993dc54340a98716e6a9f5fcfbc33681d63dd + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@18ee2276811ff4ad56a2284590c9917bec33b748 with: workflow_name: Run CCIP E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || inputs.cl_ref || github.sha }} From 44ddc1440db23040242faf9fb258da79086b6b8c Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Fri, 21 Feb 2025 14:32:57 +0100 Subject: [PATCH 4/4] do not use GAP with Docker tests --- .github/workflows/integration-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7e557cdc815..442117e1270 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -252,8 +252,6 @@ jobs: AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN: ${{ secrets.AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN }} AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }} SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }} - MAIN_DNS_ZONE_PUBLIC_SDLC: ${{ secrets.MAIN_DNS_ZONE_PUBLIC_SDLC }} - AWS_K8S_CLUSTER_NAME_SDLC: ${{ secrets.AWS_K8S_CLUSTER_NAME_SDLC }} run-core-e2e-tests-for-merge-queue: name: Run Core E2E Tests For Merge Queue @@ -297,8 +295,6 @@ jobs: AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN: ${{ secrets.AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN }} AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }} SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }} - MAIN_DNS_ZONE_PUBLIC_SDLC: ${{ secrets.MAIN_DNS_ZONE_PUBLIC_SDLC }} - AWS_K8S_CLUSTER_NAME_SDLC: ${{ secrets.AWS_K8S_CLUSTER_NAME_SDLC }} run-ccip-e2e-tests-for-pr: name: Run CCIP E2E Tests For PR