From 6f27307ee51fbcd5cf21153e171ab43603b1beae Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 14:06:29 -0400 Subject: [PATCH 1/7] edgebase path input paramenter --- .github/workflows/ee-prd.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ee-prd.yml b/.github/workflows/ee-prd.yml index fc1683991..a9472fcac 100644 --- a/.github/workflows/ee-prd.yml +++ b/.github/workflows/ee-prd.yml @@ -6,12 +6,16 @@ on: description: "Log level" required: true default: "warning" + edgeBasePath: + description: "Edge Base Path" + required: false + default: "ee" env: SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }} SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }} SAUCE_CAPABILITIES_OVERRIDES_PATH: "sauceLabsCapabilities.json" ALLOY_ENV: prod - EDGE_BASE_PATH: ee + EDGE_BASE_PATH: ${{ github.event.inputs.edgeBasePath }} jobs: store-sauce-configs: @@ -60,7 +64,7 @@ jobs: id: npm-cache with: path: "**/node_modules" - key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}-${{ secrets.NPM_CACHE_VERSION }} # increment NPM_CACHE_VERSION secret to force cache reset + key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}-${{ secrets.NPM_CACHE_VERSION }} - name: Download sauce config into tags uses: actions/download-artifact@v4 @@ -105,4 +109,5 @@ jobs: ALLOY_PROD_VERSION=${{ env.PACKAGE_VERSION }} NPM_PACKAGE_VERSION=${{ env.PACKAGE_VERSION }} ALLOY_ENV=prod - config-file: ./.sauce/ee-prd.yml + EDGE_BASE_PATH=${{ env.EDGE_BASE_PATH }} + config-file: ./.sauce/ee-prd.yml \ No newline at end of file From e62b8ee270743788fb971d20ab05fe54400e4b8b Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 14:08:23 -0400 Subject: [PATCH 2/7] remove edge browser --- .sauce/ee-prd.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index cbbc2b8a7..cf7b342c8 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -28,19 +28,6 @@ npm: - "@adobe/reactor-cookie" - "@adobe/reactor-query-string" suites: - - name: "Edge" - browserName: "microsoftedge" - headless: true - browserVersion: "119" - src: - - "test/functional/specs/**/*.js" - platformName: "Windows 11" - excludedTestFiles: - [ - "test/functional/specs/Personalization/C782718.js", - "test/functional/specs/Privacy/C5594870.js", - "test/functional/specs/Personalization/C8631577.js", - ] - name: "Safari" browserName: "safari" headless: true From 73f2ffa02e719cd81ba67b0e032b00fa60105ed4 Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 14:22:34 -0400 Subject: [PATCH 3/7] remove edge browser --- .github/workflows/ee-prd.yml | 3 ++- .sauce/ee-prd.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ee-prd.yml b/.github/workflows/ee-prd.yml index a9472fcac..79c9d3acf 100644 --- a/.github/workflows/ee-prd.yml +++ b/.github/workflows/ee-prd.yml @@ -100,6 +100,7 @@ jobs: - uses: saucelabs/saucectl-run-action@v4.3.0 env: GITHUB_TOKEN: ${{ github.token }} + EDGE_BASE_PATH: ${{ github.event.inputs.edgeBasePath }} with: sauce-username: ${{ secrets.SAUCE_USERNAME }} sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }} @@ -109,5 +110,5 @@ jobs: ALLOY_PROD_VERSION=${{ env.PACKAGE_VERSION }} NPM_PACKAGE_VERSION=${{ env.PACKAGE_VERSION }} ALLOY_ENV=prod - EDGE_BASE_PATH=${{ env.EDGE_BASE_PATH }} + EDGE_BASE_PATH=${{ github.event.inputs.edgeBasePath }} config-file: ./.sauce/ee-prd.yml \ No newline at end of file diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index cf7b342c8..f7aba76f2 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -9,7 +9,7 @@ metadata: rootDir: ./ env: ALLOY_ENV: prod - EDGE_BASE_PATH: ee + EDGE_BASE_PATH: ${EDGE_BASE_PATH:-ee} ALLOY_PROD_VERSION: $ALLOY_PROD_VERSION NPM_PACKAGE_VERSION: $NPM_PACKAGE_VERSION testcafe: @@ -64,4 +64,4 @@ suites: "test/functional/specs/Personalization/C7494472.js", "test/functional/specs/Personalization/C8631576.js", "test/functional/specs/Personalization/C8631577.js", - ] + ] \ No newline at end of file From dfabaca2872d4270843986379da4f11083d867fb Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 14:30:54 -0400 Subject: [PATCH 4/7] add depencendies --- .sauce/ee-prd.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index f7aba76f2..7d4327f46 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -21,12 +21,17 @@ disablePageCaching: true timeZone: New_York npm: dependencies: + - node-fetch - parse-uri - js-cookie - read-cache - uuid + - css.escape + - "@adobe/reactor-load-script" - "@adobe/reactor-cookie" - "@adobe/reactor-query-string" + - "@adobe/reactor-promise" + - "@adobe/reactor-object-assign" suites: - name: "Safari" browserName: "safari" From 2ca653711f50db43b5910ff0e37d3a1c33b4f302 Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 14:56:31 -0400 Subject: [PATCH 5/7] add missing browser --- .sauce/ee-prd.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index 7d4327f46..d332edd20 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -3,7 +3,6 @@ kind: testcafe showConsoleLog: true sauce: region: us-west-1 - retries: 2 metadata: name: Alloy SDK Prod ee rootDir: ./ @@ -69,4 +68,19 @@ suites: "test/functional/specs/Personalization/C7494472.js", "test/functional/specs/Personalization/C8631576.js", "test/functional/specs/Personalization/C8631577.js", - ] \ No newline at end of file + ] + - name: "Chrome" + browserName: "chrome" + browserVersion: "latest" + src: + - "test/functional/specs/**/*.js" + platformName: "Windows 11" + excludedTestFiles: + [ + "test/functional/specs/Data Collector/C81182.js", + "test/functional/specs/Privacy/C5594870.js", + "test/functional/specs/Personalization/C7494472.js", + "test/functional/specs/Privacy/C1576777.js", + "test/functional/specs/Audiences/C12411.js", + "test/functional/specs/Audiences/C31436.js", + ] From c993ac2ca3f8defdf67c6789d580ee21efaa6766 Mon Sep 17 00:00:00 2001 From: Shamiul Mowla <sham.mowla@gmail.com> Date: Mon, 12 Aug 2024 15:01:14 -0400 Subject: [PATCH 6/7] remove chrome duplicate --- .sauce/ee-prd.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index d332edd20..a4aab9490 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -55,20 +55,6 @@ suites: - "test/functional/specs/**/*.js" platformName: "Windows 11" excludedTestFiles: ["test/functional/specs/Privacy/C5594870.js"] - - name: "Chrome" - browserName: "chrome" - headless: true - browserVersion: "latest" - src: - - "test/functional/specs/**/*.js" - platformName: "Windows 11" - excludedTestFiles: - [ - "test/functional/specs/Privacy/C5594870.js", - "test/functional/specs/Personalization/C7494472.js", - "test/functional/specs/Personalization/C8631576.js", - "test/functional/specs/Personalization/C8631577.js", - ] - name: "Chrome" browserName: "chrome" browserVersion: "latest" From 8d4126512ed5c410e9a8e334dc8c39d4ca319250 Mon Sep 17 00:00:00 2001 From: jonsnyder <josnyder@adobe.com> Date: Thu, 5 Sep 2024 11:44:19 -0600 Subject: [PATCH 7/7] Remove unneeded dash --- .sauce/ee-prd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml index a4aab9490..39bb09535 100644 --- a/.sauce/ee-prd.yml +++ b/.sauce/ee-prd.yml @@ -8,7 +8,7 @@ metadata: rootDir: ./ env: ALLOY_ENV: prod - EDGE_BASE_PATH: ${EDGE_BASE_PATH:-ee} + EDGE_BASE_PATH: ${EDGE_BASE_PATH:ee} ALLOY_PROD_VERSION: $ALLOY_PROD_VERSION NPM_PACKAGE_VERSION: $NPM_PACKAGE_VERSION testcafe: