From 56fc8d5eb778d6804ea1b7e93959aec4f5994a1b Mon Sep 17 00:00:00 2001 From: Balamurali Gopalswami Date: Mon, 25 Nov 2024 16:07:36 -0500 Subject: [PATCH] Rename the existing integration-tests to e2e-tests and adding new integration-tests workflow --- .github/e2e-tests.yml | 13 ----------- .github/integration-tests.yml | 6 ++--- .github/workflows/e2e-tests.yml | 20 ++++++++--------- .github/workflows/integration-tests.yml | 30 +++++++++++-------------- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml index bf3b49eef7b..9f6495c46f7 100644 --- a/.github/e2e-tests.yml +++ b/.github/e2e-tests.yml @@ -947,19 +947,6 @@ runner-test-matrix: test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.6.0 - - - id: smoke/ccip/ccip_messaging_test.go:* - path: integration-tests/smoke/ccip/ccip_messaging_test.go - test_env_type: docker - runs_on: ubuntu-latest - triggers: - - PR E2E Core Tests - - Nightly E2E Tests - test_cmd: cd integration-tests/smoke/ccip && go test ccip_messaging_test.go -timeout 15m -test.parallel=1 -count=1 -json - pyroscope_env: ci-smoke-ccipv1_6-evm-simulated - test_env_vars: - E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 - E2E_JD_VERSION: 0.6.0 - id: smoke/ccip/ccip_batching_test.go:* path: integration-tests/smoke/ccip/ccip_batching_test.go diff --git a/.github/integration-tests.yml b/.github/integration-tests.yml index 08d46fd761b..1a43914ac75 100644 --- a/.github/integration-tests.yml +++ b/.github/integration-tests.yml @@ -10,14 +10,14 @@ runner-test-matrix: - id: smoke/ccip/ccip_messaging_test.go:* path: integration-tests/smoke/ccip/ccip_messaging_test.go - test_env_type: docker + test_env_type: in-memory runs_on: ubuntu-latest triggers: - - PR Integration Core Tests + - PR Integration CCIP Tests test_cmd: cd integration-tests/smoke/ccip && go test ccip_messaging_test.go -timeout 12m -test.parallel=2 -count=1 -json test_env_vars: E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2 E2E_JD_VERSION: 0.6.0 PG_INSTANCE: true - + # END: CCIP tests diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 304cbb5dfa7..b2e9805c31a 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -77,7 +77,7 @@ jobs: module-name: github.com/smartcontractkit/chainlink-testing-framework/lib enforce-semantic-tag: "true" changes: - environment: e2e + environment: integration name: Check Paths That Require Tests To Run runs-on: ubuntu-latest # We don't directly merge dependabot PRs, so let's not waste the resources @@ -158,7 +158,7 @@ jobs: working-directory: ${{ matrix.project.path }} build-chainlink: - environment: e2e + environment: integration permissions: id-token: write contents: read @@ -210,7 +210,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@6c81cac2e88ab503602121fe866d67830a27fc7d #ctf-run-tests@0.2.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@7d412133c4083bef6ceab13d897ac16d9c184b97 #ctf-run-tests@0.2.0 with: workflow_name: Run Core E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || github.sha }} @@ -251,7 +251,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@6c81cac2e88ab503602121fe866d67830a27fc7d #ctf-run-tests@1.0.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@7d412133c4083bef6ceab13d897ac16d9c184b97 #ctf-run-tests@1.0.0 with: workflow_name: Run Core E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || github.sha }} @@ -296,7 +296,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@6c81cac2e88ab503602121fe866d67830a27fc7d # ctf-run-tests@0.2.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@7d412133c4083bef6ceab13d897ac16d9c184b97 # ctf-run-tests@0.2.0 with: workflow_name: Run CCIP E2E Tests For PR chainlink_version: ${{ inputs.evm-ref || github.sha }} @@ -337,7 +337,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@6c81cac2e88ab503602121fe866d67830a27fc7d # ctf-run-tests@0.2.0 + uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@7d412133c4083bef6ceab13d897ac16d9c184b97 # ctf-run-tests@0.2.0 with: workflow_name: Run CCIP E2E Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || github.sha }} @@ -523,7 +523,7 @@ jobs: uses: smartcontractkit/chainlink-solana/.github/actions/projectserum_version@4b971869e26b79c7ce3fb7c98005cc2e3f350915 # stable action on Oct 12 2022 solana-test-image-exists: - environment: e2e + environment: integration permissions: checks: write pull-requests: write @@ -545,7 +545,7 @@ jobs: AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }} solana-build-contracts: - environment: e2e + environment: integration permissions: checks: write pull-requests: write @@ -575,7 +575,7 @@ jobs: image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }} solana-build-test-image: - environment: e2e + environment: integration permissions: checks: write pull-requests: write @@ -620,7 +620,7 @@ jobs: solana-smoke-tests: if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }} - environment: e2e + environment: integration permissions: checks: write pull-requests: write diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d204dc19fea..27a95348c4c 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -193,8 +193,8 @@ jobs: AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }} dep_evm_sha: ${{ inputs.evm-ref }} - run-core-integration-tests-for-pr: - name: Run Core integration Tests For PR + run-ccip-integration-tests-for-pr: + name: Run CCIP integration Tests For PR permissions: actions: read checks: write @@ -203,13 +203,12 @@ 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-integration-tests.yml@6c81cac2e88ab503602121fe866d67830a27fc7d #ctf-run-tests@0.2.0 + uses: smartcontractkit/.github/.github/workflows/run-integration-tests.yml@9dcd7f8e7e4ee66de19d7077d955751f33899d0f #ctf-run-tests@0.2.0 with: - workflow_name: Run Core Integration Tests For PR + workflow_name: Run CCIP Integration Tests For PR chainlink_version: ${{ inputs.evm-ref || github.sha }} - chainlink_upgrade_version: ${{ github.sha }} test_path: .github/integration-tests.yml - test_trigger: PR Integration Core Tests + test_trigger: PR Integration CCIP Tests upload_cl_node_coverage_artifact: true upload_cl_node_coverage_artifact_prefix: cl_node_coverage_data_ secrets: @@ -220,11 +219,10 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} AWS_REGION: ${{ secrets.QA_AWS_REGION }} 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 }} - run-core-integration-tests-for-merge-queue: - name: Run Core Integration Tests For Merge Queue + run-ccip-integration-tests-for-merge-queue: + name: Run CCIP Integration Tests For Merge Queue permissions: actions: read checks: write @@ -233,13 +231,12 @@ 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-integration-tests.yml@6c81cac2e88ab503602121fe866d67830a27fc7d #ctf-run-tests@1.0.0 + uses: smartcontractkit/.github/.github/workflows/run-integration-tests.yml@9dcd7f8e7e4ee66de19d7077d955751f33899d0f #ctf-run-tests@1.0.0 with: - workflow_name: Run Core Integration Tests For Merge Queue + workflow_name: Run CCIP Integration Tests For Merge Queue chainlink_version: ${{ inputs.evm-ref || github.sha }} - chainlink_upgrade_version: ${{ github.sha }} test_path: .github/integration-tests.yml - test_trigger: Merge Queue integration Core Tests + test_trigger: Merge Queue integration CCIP Tests upload_cl_node_coverage_artifact: true upload_cl_node_coverage_artifact_prefix: cl_node_coverage_data_ # Notify Test Tooling team in slack when merge queue tests fail @@ -254,14 +251,13 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} AWS_REGION: ${{ secrets.QA_AWS_REGION }} 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 }} check-integration-test-results: if: always() name: Integration Tests runs-on: ubuntu-latest - needs: [lint-integration-tests,run-core-integration-tests-for-pr,run-core-integration-tests-for-merge-queue] + needs: [lint-integration-tests,run-ccip-integration-tests-for-pr,run-ccip-integration-tests-for-merge-queue] steps: - name: Fail the job if core tests in PR not successful if: always() && needs.run-core-integration-tests-for-pr.result == 'failure' @@ -278,7 +274,7 @@ jobs: cleanup: name: Clean up integration environment deployments if: always() - needs: [run-core-integration-tests-for-pr, run-core-integration-tests-for-merge-queue] + needs: [run-ccip-integration-tests-for-pr, run-ccip-integration-tests-for-merge-queue] runs-on: ubuntu-latest steps: - name: Checkout repo @@ -298,7 +294,7 @@ jobs: show-chainlink-node-coverage: name: Show Chainlink Node Go Coverage if: always() - needs: [run-core-integration-tests-for-pr, run-core-integration-tests-for-merge-queue] + needs: [run-ccip-integration-tests-for-pr, run-ccip-integration-tests-for-merge-queue] runs-on: ubuntu-latest steps: - name: Checkout the repo