-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into CCIP-4165-e-2-e-tests-implement-pricing-f…
…or-tokens-transfers-tests
- Loading branch information
Showing
259 changed files
with
8,088 additions
and
4,482 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": patch | ||
| --- | ||
|
|
||
| allow different decimals on different chains for token pools |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- | ||
| "chainlink": patch | ||
| --- | ||
|
|
||
| Add two new metrics for monitoring LLO transmitter health #added | ||
|
|
||
| `llo_mercurytransmitter_concurrent_transmit_gauge` | ||
| Gauge that measures the number of transmit threads currently waiting on a remote transmit call. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max. | ||
|
|
||
| `llo_mercurytransmitter_concurrent_delete_gauge` | ||
| Gauge that measures the number of delete threads currently waiting on a delete call to the DB. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "chainlink": minor | ||
| --- | ||
|
|
||
| Update deployment address book to support non-evm chains |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ jobs: | |
| run-e2e-tests-workflow: | ||
| name: Run E2E Tests | ||
| uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected] | ||
| with: | ||
| test_path: .github/e2e-tests.yml | ||
| chainlink_version: ${{ github.sha }} | ||
| require_chainlink_image_versions_in_qa_ecr: ${{ github.sha }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -231,26 +231,14 @@ jobs: | |
| echo "COUNT=50" >> $GITHUB_ENV | ||
| echo "FUZZ_TIMEOUT_MINUTES=10">> $GITHUB_ENV | ||
| - name: Install gotestloghelper | ||
| if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }} | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/[email protected] | ||
|
|
||
| - name: Run tests | ||
| if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }} | ||
| id: run-tests | ||
| env: | ||
| OUTPUT_FILE: ./output.txt | ||
| USE_TEE: false | ||
| CL_DATABASE_URL: ${{ env.DB_URL }} | ||
| run: ./tools/bin/${{ matrix.type.cmd }} ./... | ||
|
|
||
| - name: Print Filtered Test Results | ||
| if: ${{ failure() && needs.filter.outputs.should-run-ci-core == 'true' && steps.run-tests.conclusion == 'failure' }} | ||
| run: | | ||
| if [[ "${{ matrix.type.printResults }}" == "true" ]]; then | ||
| cat output.txt | gotestloghelper -ci | ||
| fi | ||
| - name: Print Races | ||
| id: print-races | ||
| if: ${{ failure() && matrix.type.cmd == 'go_core_race_tests' && needs.filter.outputs.should-run-ci-core == 'true' }} | ||
|
|
@@ -463,15 +451,15 @@ jobs: | |
| SONAR_SCANNER_OPTS: "-Xms6g -Xmx8g" | ||
|
|
||
| trigger-flaky-test-detection-for-root-project: | ||
| name: Find New Flaky Tests In Chainlink Project | ||
| uses: ./.github/workflows/find-new-flaky-tests.yml | ||
| name: Flakeguard Root Project | ||
| uses: ./.github/workflows/flakeguard.yml | ||
| if: ${{ github.event_name == 'pull_request' }} | ||
| with: | ||
| repoUrl: 'https://github.com/smartcontractkit/chainlink' | ||
| projectPath: '.' | ||
| baseRef: ${{ github.base_ref }} | ||
| headRef: ${{ github.head_ref }} | ||
| runThreshold: '0.99' | ||
| maxPassRatio: '1.0' | ||
| findByTestFilesDiff: true | ||
| findByAffectedPackages: false | ||
| slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications | ||
|
|
@@ -480,16 +468,16 @@ jobs: | |
| SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }} | ||
|
|
||
| trigger-flaky-test-detection-for-deployment-project: | ||
| name: Find New Flaky Tests In Deployment Project | ||
| uses: ./.github/workflows/find-new-flaky-tests.yml | ||
| name: Flakeguard Deployment Project | ||
| uses: ./.github/workflows/flakeguard.yml | ||
| needs: [filter] | ||
| if: ${{ github.event_name == 'pull_request' && needs.filter.outputs.deployment-changes == 'true'}} | ||
| with: | ||
| repoUrl: 'https://github.com/smartcontractkit/chainlink' | ||
| projectPath: 'deployment' | ||
| baseRef: ${{ github.base_ref }} | ||
| headRef: ${{ github.head_ref }} | ||
| runThreshold: '0.99' | ||
| maxPassRatio: '1.0' | ||
| findByTestFilesDiff: true | ||
| findByAffectedPackages: false | ||
| slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: Find Flaky Tests | ||
| name: Flakeguard | ||
|
|
||
| on: | ||
| workflow_call: | ||
|
|
@@ -25,11 +25,11 @@ on: | |
| type: boolean | ||
| description: 'Run all tests in the project.' | ||
| default: false | ||
| runThreshold: | ||
| maxPassRatio: | ||
| required: false | ||
| type: string | ||
| description: 'The threshold for the number of times a test can fail before being considered flaky.' | ||
| default: '0.9' | ||
| description: 'The maximum (non-inclusive) pass ratio threshold for a test to be considered a failure. Any tests below this pass rate will be considered flaky.' | ||
| default: '1.0' | ||
| findByTestFilesDiff: | ||
| required: false | ||
| type: boolean | ||
|
|
@@ -64,7 +64,6 @@ env: | |
| DEFAULT_RUNNER: 'ubuntu-latest' # The default runner to use for running tests. | ||
| UPLOAD_ALL_TEST_RESULTS: ${{ fromJson(inputs.extraArgs)['upload_all_test_results'] || 'false' }} # Whether to upload all test results as artifacts. | ||
| PRINT_FAILED_TESTS: ${{ fromJson(inputs.extraArgs)['print_failed_tests'] || 'false' }} # Whether to print failed tests in the GitHub console. | ||
| MIN_PASS_RATIO: ${{ fromJson(inputs.extraArgs)['min_pass_ratio'] || '0.001' }} # The minimum pass ratio for a test to be considered as flaky. Used to distinguish between tests that are truly flaky (with inconsistent results) and those that are consistently failing. Set to 0 if you want to consider all failed tests as flaky. | ||
|
|
||
| jobs: | ||
| get-tests: | ||
|
|
@@ -99,7 +98,7 @@ jobs: | |
|
|
||
| - name: Install flakeguard | ||
| shell: bash | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@8b02ed1703ef40755a4c46ff454cf4ff2e89275d | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@be06798af83ef6d9f7cf04e8b10a8484520c5061 # [email protected] | ||
|
|
||
| - name: Find new or updated test packages | ||
| if: ${{ inputs.runAllTests == false }} | ||
|
|
@@ -258,11 +257,11 @@ jobs: | |
|
|
||
| - name: Install flakeguard | ||
| shell: bash | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@8b02ed1703ef40755a4c46ff454cf4ff2e89275d | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@be06798af83ef6d9f7cf04e8b10a8484520c5061 # [email protected] | ||
|
|
||
| - name: Run tests with flakeguard | ||
| shell: bash | ||
| run: flakeguard run --project-path=${{ inputs.projectPath }} --test-packages=${{ matrix.testPackages }} --run-count=${{ env.TEST_REPEAT_COUNT }} --min-pass-ratio=${{ env.MIN_PASS_RATIO }} --threshold=${{ inputs.runThreshold }} --race=${{ env.RUN_WITH_RACE }} --skip-tests=${{ env.SKIPPED_TESTS }} --print-failed-tests=${{ env.PRINT_FAILED_TESTS }} --output-json=test-result.json | ||
| run: flakeguard run --project-path=${{ inputs.projectPath }} --test-packages=${{ matrix.testPackages }} --run-count=${{ env.TEST_REPEAT_COUNT }} --max-pass-ratio=${{ inputs.maxPassRatio }} --race=${{ env.RUN_WITH_RACE }} --skip-tests=${{ env.SKIPPED_TESTS }} --print-failed-tests=${{ env.PRINT_FAILED_TESTS }} --output-json=test-result.json | ||
| env: | ||
| CL_DATABASE_URL: ${{ env.DB_URL }} | ||
|
|
||
|
|
@@ -300,7 +299,7 @@ jobs: | |
|
|
||
| - name: Install flakeguard | ||
| shell: bash | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@8b02ed1703ef40755a4c46ff454cf4ff2e89275d | ||
| run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/flakeguard@be06798af83ef6d9f7cf04e8b10a8484520c5061 # [email protected] | ||
|
|
||
| - name: Set combined test results | ||
| id: set_test_results | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- | ||
| '@chainlink/contracts': patch | ||
| --- | ||
|
|
||
| allow multiple remote pools per chain selector | ||
|
|
||
|
|
||
| PR issue: CCIP-4269 | ||
|
|
||
| Solidity Review issue: CCIP-3966 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@chainlink/contracts': patch | ||
| --- | ||
|
|
||
| Update token pool factory to support new token pool design with arbitrary decimals #bugfix |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.