From 77ed95e7f469c6e5533e6f51e4b9eee5b99f3b4f Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Thu, 24 Oct 2024 11:27:35 +0200 Subject: [PATCH] `9.0.x` & `develop` : Split modules campaign --- .github/workflows/pr_security_test_one.yml | 40 ++++++++++++++++++ .github/workflows/pr_test.yml | 42 +++++++++++++++++++ .github/workflows/pr_test_one.yml | 40 ++++++++++++++++++ .github/workflows/pr_test_single_campaign.yml | 4 ++ .github/workflows/test-sanity.yml | 7 +--- .github/workflows/test-with-prebuilt-shop.yml | 7 +--- 6 files changed, 128 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr_security_test_one.yml b/.github/workflows/pr_security_test_one.yml index 03966ed5..74bfcd99 100644 --- a/.github/workflows/pr_security_test_one.yml +++ b/.github/workflows/pr_security_test_one.yml @@ -111,6 +111,10 @@ jobs: - 'functional:productV2' - 'functional:WS' - 'modules' + - 'modules:01-09' + - 'modules:10-19' + - 'modules:20-29' + - 'modules:30-39' - 'regression' - 'sanity' - 'sanity:productV2' @@ -144,6 +148,14 @@ jobs: TEST_CAMPAIGN: 'functional:WS' - BASE_BRANCH: 1.7.8.x TEST_CAMPAIGN: 'modules' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:30-39' - BASE_BRANCH: 1.7.8.x TEST_CAMPAIGN: 'sanity:productV2' ## 8.0.x @@ -173,6 +185,14 @@ jobs: TEST_CAMPAIGN: 'functional:WS' - BASE_BRANCH: 8.0.x TEST_CAMPAIGN: 'modules' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:30-39' ## 8.1.x - BASE_BRANCH: 8.1.x TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12' @@ -186,6 +206,14 @@ jobs: TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 8.1.x TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:30-39' ## 8.2.x - BASE_BRANCH: 8.2.x TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12' @@ -199,6 +227,14 @@ jobs: TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 8.2.x TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:30-39' ## 9.0.x - BASE_BRANCH: 9.0.x TEST_CAMPAIGN: 'functional:FO:01-03' @@ -210,6 +246,8 @@ jobs: TEST_CAMPAIGN: 'functional:productV2' - BASE_BRANCH: 9.0.x TEST_CAMPAIGN: 'sanity:productV2' + - BASE_BRANCH: 9.0.x + TEST_CAMPAIGN: 'modules' ## develop - BASE_BRANCH: develop TEST_CAMPAIGN: 'functional:FO:01-03' @@ -221,6 +259,8 @@ jobs: TEST_CAMPAIGN: 'functional:productV2' - BASE_BRANCH: develop TEST_CAMPAIGN: 'sanity:productV2' + - BASE_BRANCH: develop + TEST_CAMPAIGN: 'modules' steps: # Checkout Private repository diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml index 793fb7b9..a5864d8b 100644 --- a/.github/workflows/pr_test.yml +++ b/.github/workflows/pr_test.yml @@ -164,6 +164,12 @@ jobs: ## 8.2.x - BASE_BRANCH: 8.2.x TEST_COMMAND: 'functional:FO:hummingbird:08-12' + ## 9.0.x + - BASE_BRANCH: 9.0.x + TEST_COMMAND: 'modules' + ## develop + - BASE_BRANCH: develop + TEST_COMMAND: 'modules' test-short-campaigns: name: Run short campaign ${{ matrix.TEST_COMMAND }} @@ -209,6 +215,10 @@ jobs: - 'functional:FO:hummingbird:04-07' - 'functional:productV2' - 'functional:WS' + - 'modules:01-09' + - 'modules:10-19' + - 'modules:20-29' + - 'modules:30-39' - 'regression' - 'sanity:productV2' BASE_BRANCH: @@ -231,6 +241,14 @@ jobs: TEST_COMMAND: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 1.7.8.x TEST_COMMAND: 'functional:WS' + - BASE_BRANCH: 1.7.8.x + TEST_COMMAND: 'modules:01-09' + - BASE_BRANCH: 1.7.8.x + TEST_COMMAND: 'modules:10-19' + - BASE_BRANCH: 1.7.8.x + TEST_COMMAND: 'modules:20-29' + - BASE_BRANCH: 1.7.8.x + TEST_COMMAND: 'modules:30-39' - BASE_BRANCH: 1.7.8.x TEST_COMMAND: 'sanity:productV2' ## 8.0.x @@ -250,6 +268,14 @@ jobs: TEST_COMMAND: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 8.0.x TEST_COMMAND: 'functional:WS' + - BASE_BRANCH: 8.0.x + TEST_COMMAND: 'modules:01-09' + - BASE_BRANCH: 8.0.x + TEST_COMMAND: 'modules:10-19' + - BASE_BRANCH: 8.0.x + TEST_COMMAND: 'modules:20-29' + - BASE_BRANCH: 8.0.x + TEST_COMMAND: 'modules:30-39' ## 8.1.x - BASE_BRANCH: 8.1.x TEST_COMMAND: 'functional:BO:advanced-parameters:11-12' @@ -261,6 +287,14 @@ jobs: TEST_COMMAND: 'functional:FO:08-12' - BASE_BRANCH: 8.1.x TEST_COMMAND: 'functional:FO:hummingbird:04-07' + - BASE_BRANCH: 8.1.x + TEST_COMMAND: 'modules:01-09' + - BASE_BRANCH: 8.1.x + TEST_COMMAND: 'modules:10-19' + - BASE_BRANCH: 8.1.x + TEST_COMMAND: 'modules:20-29' + - BASE_BRANCH: 8.1.x + TEST_COMMAND: 'modules:30-39' ## 8.2.x - BASE_BRANCH: 8.2.x TEST_COMMAND: 'functional:BO:advanced-parameters:11-12' @@ -272,6 +306,14 @@ jobs: TEST_COMMAND: 'functional:FO:08-12' - BASE_BRANCH: 8.2.x TEST_COMMAND: 'functional:FO:hummingbird:04-07' + - BASE_BRANCH: 8.2.x + TEST_COMMAND: 'modules:01-09' + - BASE_BRANCH: 8.2.x + TEST_COMMAND: 'modules:10-19' + - BASE_BRANCH: 8.2.x + TEST_COMMAND: 'modules:20-29' + - BASE_BRANCH: 8.2.x + TEST_COMMAND: 'modules:30-39' ## 9.0.x - BASE_BRANCH: 9.0.x TEST_COMMAND: 'functional:FO:01-03' diff --git a/.github/workflows/pr_test_one.yml b/.github/workflows/pr_test_one.yml index fe9436cb..706f8496 100644 --- a/.github/workflows/pr_test_one.yml +++ b/.github/workflows/pr_test_one.yml @@ -114,6 +114,10 @@ jobs: - 'functional:productV2' - 'functional:WS' - 'modules' + - 'modules:01-09' + - 'modules:10-19' + - 'modules:20-29' + - 'modules:30-39' - 'regression' - 'sanity' - 'sanity:productV2' @@ -147,6 +151,14 @@ jobs: TEST_CAMPAIGN: 'functional:WS' - BASE_BRANCH: 1.7.8.x TEST_CAMPAIGN: 'modules' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 1.7.8.x + TEST_CAMPAIGN: 'modules:30-39' - BASE_BRANCH: 1.7.8.x TEST_CAMPAIGN: 'sanity:productV2' ## 8.0.x @@ -176,6 +188,14 @@ jobs: TEST_CAMPAIGN: 'functional:WS' - BASE_BRANCH: 8.0.x TEST_CAMPAIGN: 'modules' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.0.x + TEST_CAMPAIGN: 'modules:30-39' ## 8.1.x - BASE_BRANCH: 8.1.x TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12' @@ -189,6 +209,14 @@ jobs: TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 8.1.x TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.1.x + TEST_CAMPAIGN: 'modules:30-39' ## 8.2.x - BASE_BRANCH: 8.2.x TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12' @@ -202,6 +230,14 @@ jobs: TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07' - BASE_BRANCH: 8.2.x TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:01-09' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:10-19' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:20-29' + - BASE_BRANCH: 8.2.x + TEST_CAMPAIGN: 'modules:30-39' ## 9.0.x - BASE_BRANCH: 9.0.x TEST_CAMPAIGN: 'functional:FO:01-03' @@ -213,6 +249,8 @@ jobs: TEST_CAMPAIGN: 'functional:productV2' - BASE_BRANCH: 9.0.x TEST_CAMPAIGN: 'sanity:productV2' + - BASE_BRANCH: 9.0.x + TEST_CAMPAIGN: 'modules' ## develop - BASE_BRANCH: develop TEST_CAMPAIGN: 'functional:FO:01-03' @@ -224,6 +262,8 @@ jobs: TEST_CAMPAIGN: 'functional:productV2' - BASE_BRANCH: develop TEST_CAMPAIGN: 'sanity:productV2' + - BASE_BRANCH: develop + TEST_CAMPAIGN: 'modules' steps: - name: Print Inputs values diff --git a/.github/workflows/pr_test_single_campaign.yml b/.github/workflows/pr_test_single_campaign.yml index 98f4053c..a1be9e40 100644 --- a/.github/workflows/pr_test_single_campaign.yml +++ b/.github/workflows/pr_test_single_campaign.yml @@ -64,6 +64,10 @@ on: - 'functional:productV2' - 'functional:WS' - 'modules' + - 'modules:01-09' + - 'modules:10-19' + - 'modules:20-29' + - 'modules:30-39' - 'regression' - 'sanity' - 'sanity:productV2' diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml index 238a0e70..fa14bf39 100644 --- a/.github/workflows/test-sanity.yml +++ b/.github/workflows/test-sanity.yml @@ -201,12 +201,7 @@ jobs: # Playwright must be installed all the time, we only install chromium since it's the only browser used - name: Install browsers working-directory: ${{ env.PS_DIR }}/tests/UI - if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' }} - run: npx playwright install chromium - - - name: Install browsers - working-directory: ${{ env.PS_DIR }}/tests/UI - if: inputs.base_branch == 'develop' + if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' || inputs.base_branch == '9.0.x' || inputs.base_branch == 'develop' }} run: npx playwright install chromium - name: Run sanity campaign diff --git a/.github/workflows/test-with-prebuilt-shop.yml b/.github/workflows/test-with-prebuilt-shop.yml index 66c0c34b..95a8b8ae 100644 --- a/.github/workflows/test-with-prebuilt-shop.yml +++ b/.github/workflows/test-with-prebuilt-shop.yml @@ -171,12 +171,7 @@ jobs: # Playwright must be installed all the time, we only install chromium since it's the only browser used - name: Install browsers working-directory: ${{ env.PS_DIR }}/tests/UI - if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' }} - run: npx playwright install chromium - - - name: Install browsers - working-directory: ${{ env.PS_DIR }}/tests/UI - if: inputs.base_branch == 'develop' + if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' || inputs.base_branch == '9.0.x' || inputs.base_branch == 'develop' }} run: npx playwright install chromium - name: Run campaign ${{ inputs.test_command }} on prebuilt shop