From 9674755304ed4b2d7f327f6517281ec3149fe86e Mon Sep 17 00:00:00 2001 From: goncer Date: Mon, 6 Nov 2023 16:19:00 +0100 Subject: [PATCH 01/22] Setup new matrix for run with chops - dynamic matrix --- .github/workflows/reusable-e2e-tests.yml | 58 +++++++++++------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 9d28f9392e..276b9a65b7 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -56,6 +56,31 @@ permissions: checks: write jobs: + matrix-setup: + runs-on: [ubuntu-latest] + steps: + - name: Setup-Matrix PullRequest Run + if: github.event_name != 'pull_request' || true + run: | + MATRIX_PARAMS_COMBINATIONS=' + {"command": "yarn test-parallel --max-workers=10", "fast": false }, + {"command": "yarn test-sequential-no-bootstrap", "fast": false }, + {"command": "yarn test-seqgasless", "fast": false }, + {"command": "yarn test-maintenance", "fast": true }, + {"command": "yarn test-bootstrap", "fast": false }, + {"command": "yarn test-rewards-bootstrap", "fast": false }, + {"command": "yarn test-parallel-autocompound", "fast": true }, + {"command": "yarn test-sequential-autocompound", "fast": true }, + {"command": "yarn test-poolliquidity", "fast": true }, + {"command": "yarn test-governance", "fast": true }, + {"command": "yarn test-multiswap", "fast": false }, + {"command": "yarn test-experimentalStaking", "fast": true }, + {"command": "yarn test-crowdloan", "fast": false }, + {"command": "yarn test-sdk", "fast": true }, + ' + echo ::set-output name=matrix-combinations::{\"include\":[$MATRIX_PARAMS_COMBINATIONS]} + outputs: + matrix-combinations: ${{ steps.setup-matrix-combinations.outputs.matrix-combinations }} setup-report: runs-on: [ubuntu-latest] outputs: @@ -90,39 +115,10 @@ jobs: e2e-test-matrix: - needs: [setup-report] + needs: [setup-report, matrix-setup] strategy: fail-fast: false - matrix: - include: - - command: "yarn test-parallel --max-workers=10" - fast: false - - command: "yarn test-sequential-no-bootstrap" - fast: false - - command: "yarn test-seqgasless" - fast: false - - command: "yarn test-maintenance" - fast: true - - command: "yarn test-bootstrap" - fast: false - - command: "yarn test-rewards-bootstrap" - fast: false - - command: "yarn test-parallel-autocompound" - fast: true - - command: "yarn test-sequential-autocompound" - fast: true - - command: "yarn test-poolliquidity" - fast: true - - command: "yarn test-governance" - fast: true - - command: "yarn test-multiswap" - fast: false - - command: "yarn test-experimentalStaking" - fast: true - - command: "yarn test-crowdloan" - fast: false - - command: "yarn test-sdk" - fast: true + matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix-combinations) }} runs-on: [e2e-gke] timeout-minutes: 180 env: From a29c3a01a296203f1e6621ff9a7fb197ca9444c5 Mon Sep 17 00:00:00 2001 From: goncer Date: Mon, 6 Nov 2023 17:47:15 +0100 Subject: [PATCH 02/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 276b9a65b7..baed2ab0a9 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -80,7 +80,7 @@ jobs: ' echo ::set-output name=matrix-combinations::{\"include\":[$MATRIX_PARAMS_COMBINATIONS]} outputs: - matrix-combinations: ${{ steps.setup-matrix-combinations.outputs.matrix-combinations }} + matrix-combinations: ${{ steps.matrix-setup.outputs.matrix-combinations }} setup-report: runs-on: [ubuntu-latest] outputs: @@ -118,7 +118,7 @@ jobs: needs: [setup-report, matrix-setup] strategy: fail-fast: false - matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix-combinations) }} + matrix: ${{ fromJson(needs.matrix-setup.outputs.matrix-combinations) }} runs-on: [e2e-gke] timeout-minutes: 180 env: From 822b0a7ba1541118a96597e5c15b95f79d443f38 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 09:47:58 +0100 Subject: [PATCH 03/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index baed2ab0a9..aab885b571 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -60,7 +60,6 @@ jobs: runs-on: [ubuntu-latest] steps: - name: Setup-Matrix PullRequest Run - if: github.event_name != 'pull_request' || true run: | MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, From a63de0e51c6844c32d995f1b4c7b0c744dd537f6 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 09:59:31 +0100 Subject: [PATCH 04/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index aab885b571..ec1ef256e2 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -77,7 +77,7 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - echo ::set-output name=matrix-combinations::{\"include\":[$MATRIX_PARAMS_COMBINATIONS]} + echo '::set-output name=matrix-combinations::{"include":[$MATRIX_PARAMS_COMBINATIONS]}' outputs: matrix-combinations: ${{ steps.matrix-setup.outputs.matrix-combinations }} setup-report: From ba3eb028b6345f46d331d71185dd3d46df53410c Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:17:34 +0100 Subject: [PATCH 05/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index ec1ef256e2..07ed97b054 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -77,9 +77,9 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - echo '::set-output name=matrix-combinations::{"include":[$MATRIX_PARAMS_COMBINATIONS]}' + echo 'matrix={"include":[$MATRIX_PARAMS_COMBINATIONS]}' >> $GITHUB_OUTPUT outputs: - matrix-combinations: ${{ steps.matrix-setup.outputs.matrix-combinations }} + matrix: ${{ steps.matrix-setup.outputs.matrix }} setup-report: runs-on: [ubuntu-latest] outputs: @@ -117,7 +117,7 @@ jobs: needs: [setup-report, matrix-setup] strategy: fail-fast: false - matrix: ${{ fromJson(needs.matrix-setup.outputs.matrix-combinations) }} + matrix: ${{ fromJson(needs.matrix-setup.outputs.matrix) }} runs-on: [e2e-gke] timeout-minutes: 180 env: From a1e812fc2d6137bc8ba21f2b3e1d3c94b53dd7e5 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:22:16 +0100 Subject: [PATCH 06/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 07ed97b054..54e94b0240 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -113,8 +113,18 @@ jobs: id: setTestRun + print: + runs-on: [ubuntu-latest] + needs: matrix-setup + steps: + - name: get + run: | + matrix="${{ needs.matrix-setup.outputs.matrix }}" + echo "Hello" + echo "$matrix" + e2e-test-matrix: - needs: [setup-report, matrix-setup] + needs: [setup-report, print] strategy: fail-fast: false matrix: ${{ fromJson(needs.matrix-setup.outputs.matrix) }} From a187870abf10957ac2e02ea16310cf66b8f5e4ce Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:27:11 +0100 Subject: [PATCH 07/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 54e94b0240..a2c15e8b6f 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -59,7 +59,7 @@ jobs: matrix-setup: runs-on: [ubuntu-latest] steps: - - name: Setup-Matrix PullRequest Run + - name: matrix-to-run run: | MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, @@ -79,7 +79,7 @@ jobs: ' echo 'matrix={"include":[$MATRIX_PARAMS_COMBINATIONS]}' >> $GITHUB_OUTPUT outputs: - matrix: ${{ steps.matrix-setup.outputs.matrix }} + matrix: ${{ steps.matrix-to-run.outputs.matrix }} setup-report: runs-on: [ubuntu-latest] outputs: From 2a2beebb2041dfaf06462963f6baee8b9908d11d Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:32:48 +0100 Subject: [PATCH 08/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index a2c15e8b6f..bea499ecef 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -60,6 +60,7 @@ jobs: runs-on: [ubuntu-latest] steps: - name: matrix-to-run + id: matrixToRun run: | MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, @@ -79,7 +80,7 @@ jobs: ' echo 'matrix={"include":[$MATRIX_PARAMS_COMBINATIONS]}' >> $GITHUB_OUTPUT outputs: - matrix: ${{ steps.matrix-to-run.outputs.matrix }} + matrix: ${{ steps.matrixToRun.outputs.matrix }} setup-report: runs-on: [ubuntu-latest] outputs: From 50c53e8af42f643f20e50a3262f855ad90ed4c94 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:41:40 +0100 Subject: [PATCH 09/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index bea499ecef..2e2e40122e 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -78,7 +78,7 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - echo 'matrix={"include":[$MATRIX_PARAMS_COMBINATIONS]}' >> $GITHUB_OUTPUT + echo "matrix={\"include\":[$MATRIX_PARAMS_COMBINATIONS]}" >> $GITHUB_OUTPUT outputs: matrix: ${{ steps.matrixToRun.outputs.matrix }} setup-report: From 26191c803eba2a2a66d1bbe40f6ffb28f61dce8f Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 10:58:55 +0100 Subject: [PATCH 10/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 2e2e40122e..22bc5a06b6 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -62,6 +62,7 @@ jobs: - name: matrix-to-run id: matrixToRun run: | + { MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, @@ -78,7 +79,10 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - echo "matrix={\"include\":[$MATRIX_PARAMS_COMBINATIONS]}" >> $GITHUB_OUTPUT + echo "matrix<> $GITHUB_OUTPUT outputs: matrix: ${{ steps.matrixToRun.outputs.matrix }} setup-report: From 6e981688df3fa018da3b4a4244dc602dbe0ea9d4 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:03:31 +0100 Subject: [PATCH 11/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 22bc5a06b6..dd3ac7a8c4 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -80,7 +80,7 @@ jobs: {"command": "yarn test-sdk", "fast": true }, ' echo "matrix<> $GITHUB_OUTPUT outputs: From 5f0694743124688985e53c86e89feb0dafe37acf Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:06:58 +0100 Subject: [PATCH 12/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index dd3ac7a8c4..d65b5ca95b 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -116,20 +116,9 @@ jobs: TESTMO_URL: ${{ secrets.TESTMO_URL }} TESTMO_TOKEN: ${{ secrets.TESTMO_TOKEN }} id: setTestRun - - - print: - runs-on: [ubuntu-latest] - needs: matrix-setup - steps: - - name: get - run: | - matrix="${{ needs.matrix-setup.outputs.matrix }}" - echo "Hello" - echo "$matrix" - + e2e-test-matrix: - needs: [setup-report, print] + needs: [setup-report, matrix-setup] strategy: fail-fast: false matrix: ${{ fromJson(needs.matrix-setup.outputs.matrix) }} From ebd1b7dce1f31b299d78c785d3b3b607c8739210 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:34:05 +0100 Subject: [PATCH 13/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index d65b5ca95b..1fbb4f5f81 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -79,12 +79,18 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' + if [[ "${{ github.event_name }}" != "pull_request" ]]; then + MATRIX_PARAMS_COMBINATIONS=' + {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, + ' + fi echo "matrix<> $GITHUB_OUTPUT outputs: matrix: ${{ steps.matrixToRun.outputs.matrix }} + setup-report: runs-on: [ubuntu-latest] outputs: From 2fd162975c3bf258554f70eba651fe8deb35c908 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:49:02 +0100 Subject: [PATCH 14/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 1fbb4f5f81..96aca29462 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -12,21 +12,27 @@ on: description: "Name of the parachain docker reference" type: string required: false - default: "mangatasolutions/mangata-node:latest" + default: "mangatasolutions/mangata-node:develop" skipBuild: description: "Skip build phase" type: string required: false - default: 'false' + default: 'true' globalVersion: description: "Set Mangata node version." type: string required: true + default: 'develop' mangataTypesVersion: description: "Set @mangata-finance/types version" type: string default: "" required: false + withChopsticks: + description: "Run with chopsticks" + type: bool + default: false + required: true workflow_call: inputs: e2eBranch: @@ -79,7 +85,7 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - if [[ "${{ github.event_name }}" != "pull_request" ]]; then + if [[ "${{ github.event_name }}" != "pull_request" ]] || [[ ${{ inputs.withChopsticks }} == 'true' ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, ' From 9e284e5454a8ad8f5ab4d6417a69b3459fe58471 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:55:21 +0100 Subject: [PATCH 15/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 96aca29462..cee05ff50f 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -85,7 +85,7 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - if [[ "${{ github.event_name }}" != "pull_request" ]] || [[ ${{ inputs.withChopsticks }} == 'true' ]] ; then + if [[ "${{ github.event_name }}" != "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, ' From 5020da2a7b869c20ed652ff9187849f544129597 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 11:58:48 +0100 Subject: [PATCH 16/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index cee05ff50f..230e263ea6 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -85,6 +85,8 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' + echo "${{ github.event_name }}" + echo "${{ inputs.withChopsticks }}" if [[ "${{ github.event_name }}" != "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, From d88d3b6240590e111a21adff477ec7cc27a5ccc7 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 12:01:39 +0100 Subject: [PATCH 17/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 230e263ea6..eb8bd27a0d 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -87,7 +87,7 @@ jobs: ' echo "${{ github.event_name }}" echo "${{ inputs.withChopsticks }}" - if [[ "${{ github.event_name }}" != "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then + if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, ' From ce847e781c4bcadd1a4e67b808eb6a9a860b6e43 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 12:01:56 +0100 Subject: [PATCH 18/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index eb8bd27a0d..b0403c85ce 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -85,8 +85,6 @@ jobs: {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, ' - echo "${{ github.event_name }}" - echo "${{ inputs.withChopsticks }}" if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, From 6e8cf245a8eefdf34e586841346f25234cbe6c10 Mon Sep 17 00:00:00 2001 From: goncer Date: Tue, 7 Nov 2023 12:06:05 +0100 Subject: [PATCH 19/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index b0403c85ce..13fd190d57 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -88,6 +88,20 @@ jobs: if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, + {"command": "test-parallel-skipped-chops --max-workers=10", "fast": false }, + {"command": "yarn test-sequential-no-bootstrap", "fast": false }, + {"command": "yarn test-seqgasless", "fast": false }, + {"command": "yarn test-maintenance", "fast": true }, + {"command": "test-bootstrap-chops", "fast": false }, + {"command": "yarn test-rewards-bootstrap", "fast": false }, + {"command": "yarn test-parallel-autocompound", "fast": true }, + {"command": "yarn test-sequential-autocompound", "fast": true }, + {"command": "yarn test-poolliquidity", "fast": true }, + {"command": "yarn test-governance", "fast": true }, + {"command": "yarn test-multiswap", "fast": false }, + {"command": "yarn test-experimentalStaking", "fast": true }, + {"command": "yarn test-crowdloan", "fast": false }, + {"command": "yarn test-sdk", "fast": true }, ' fi echo "matrix< Date: Tue, 7 Nov 2023 13:19:17 +0100 Subject: [PATCH 20/22] Update reusable-e2e-tests.yml --- .github/workflows/reusable-e2e-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index 13fd190d57..be9cdc85f6 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -88,11 +88,11 @@ jobs: if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, - {"command": "test-parallel-skipped-chops --max-workers=10", "fast": false }, + {"command": "yarn test-parallel-skipped-chops --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, {"command": "yarn test-seqgasless", "fast": false }, {"command": "yarn test-maintenance", "fast": true }, - {"command": "test-bootstrap-chops", "fast": false }, + {"command": "yarn test-bootstrap-chops", "fast": false }, {"command": "yarn test-rewards-bootstrap", "fast": false }, {"command": "yarn test-parallel-autocompound", "fast": true }, {"command": "yarn test-sequential-autocompound", "fast": true }, From aa740dd4599e63df6075b47198c32d307598db18 Mon Sep 17 00:00:00 2001 From: tenequm Date: Tue, 7 Nov 2023 14:39:16 +0200 Subject: [PATCH 21/22] chore: update matrix job setup config format --- .github/workflows/reusable-e2e-tests.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index be9cdc85f6..dca19a6c6e 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -68,7 +68,6 @@ jobs: - name: matrix-to-run id: matrixToRun run: | - { MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, @@ -84,15 +83,15 @@ jobs: {"command": "yarn test-experimentalStaking", "fast": true }, {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, - ' + ' if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, - {"command": "yarn test-parallel-skipped-chops --max-workers=10", "fast": false }, + {"command": "test-parallel-skipped-chops --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, {"command": "yarn test-seqgasless", "fast": false }, {"command": "yarn test-maintenance", "fast": true }, - {"command": "yarn test-bootstrap-chops", "fast": false }, + {"command": "test-bootstrap-chops", "fast": false }, {"command": "yarn test-rewards-bootstrap", "fast": false }, {"command": "yarn test-parallel-autocompound", "fast": true }, {"command": "yarn test-sequential-autocompound", "fast": true }, @@ -102,12 +101,9 @@ jobs: {"command": "yarn test-experimentalStaking", "fast": true }, {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, - ' + ' fi - echo "matrix<> $GITHUB_OUTPUT + echo "matrix={\"include\":[$MATRIX_PARAMS_COMBINATIONS]}" >> $GITHUB_OUTPUT outputs: matrix: ${{ steps.matrixToRun.outputs.matrix }} From 59b2cd87a8e22492e587ee0df15a6bd896ff030f Mon Sep 17 00:00:00 2001 From: tenequm Date: Tue, 7 Nov 2023 14:55:29 +0200 Subject: [PATCH 22/22] Revert "chore: update matrix job setup config format" This reverts commit aa740dd4599e63df6075b47198c32d307598db18. --- .github/workflows/reusable-e2e-tests.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable-e2e-tests.yml b/.github/workflows/reusable-e2e-tests.yml index dca19a6c6e..be9cdc85f6 100644 --- a/.github/workflows/reusable-e2e-tests.yml +++ b/.github/workflows/reusable-e2e-tests.yml @@ -68,6 +68,7 @@ jobs: - name: matrix-to-run id: matrixToRun run: | + { MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, @@ -83,15 +84,15 @@ jobs: {"command": "yarn test-experimentalStaking", "fast": true }, {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, - ' + ' if [[ "${{ github.event_name }}" == "pull_request" ]] || [[ "${{ inputs.withChopsticks }}" == "true" ]] ; then MATRIX_PARAMS_COMBINATIONS=' {"command": "yarn test-parallel-chops --max-workers=1", "fast": false }, - {"command": "test-parallel-skipped-chops --max-workers=10", "fast": false }, + {"command": "yarn test-parallel-skipped-chops --max-workers=10", "fast": false }, {"command": "yarn test-sequential-no-bootstrap", "fast": false }, {"command": "yarn test-seqgasless", "fast": false }, {"command": "yarn test-maintenance", "fast": true }, - {"command": "test-bootstrap-chops", "fast": false }, + {"command": "yarn test-bootstrap-chops", "fast": false }, {"command": "yarn test-rewards-bootstrap", "fast": false }, {"command": "yarn test-parallel-autocompound", "fast": true }, {"command": "yarn test-sequential-autocompound", "fast": true }, @@ -101,9 +102,12 @@ jobs: {"command": "yarn test-experimentalStaking", "fast": true }, {"command": "yarn test-crowdloan", "fast": false }, {"command": "yarn test-sdk", "fast": true }, - ' + ' fi - echo "matrix={\"include\":[$MATRIX_PARAMS_COMBINATIONS]}" >> $GITHUB_OUTPUT + echo "matrix<> $GITHUB_OUTPUT outputs: matrix: ${{ steps.matrixToRun.outputs.matrix }}