Refactor Alloy Prod Upstreams Workflow (#1159)

* edgebase path input parameter --------- Co-authored-by: jonsnyder <[email protected]>
adobe · Sep 5, 2024 · 4b2196d · 4b2196d
1 parent ede522e
commit 4b2196d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git 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
@@ -96,6 +100,7 @@ jobs:
       - uses: saucelabs/[email protected]
         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 }}
@@ -105,4 +110,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=${{ github.event.inputs.edgeBasePath }}
+          config-file: ./.sauce/ee-prd.yml
diff --git a/.sauce/ee-prd.yml b/.sauce/ee-prd.yml
@@ -3,13 +3,12 @@ kind: testcafe
 showConsoleLog: true
 sauce:
   region: us-west-1
-  retries: 2
 metadata:
   name: Alloy SDK Prod ee
 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:
@@ -21,26 +20,18 @@ 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: "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
@@ -66,15 +57,16 @@ suites:
     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/Data Collector/C81182.js",
         "test/functional/specs/Privacy/C5594870.js",
         "test/functional/specs/Personalization/C7494472.js",
-        "test/functional/specs/Personalization/C8631576.js",
-        "test/functional/specs/Personalization/C8631577.js",
+        "test/functional/specs/Privacy/C1576777.js",
+        "test/functional/specs/Audiences/C12411.js",
+        "test/functional/specs/Audiences/C31436.js",
       ]