CI/CD - Update containers to work with new flow (#445)

metal-messiah · web-flow · commit 03ee38cf3eee · 2023-03-30T11:55:24.000-04:00
diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
@@ -6,23 +6,24 @@ on:
 jobs:
   publish-npm:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
 
     env:
-      GH_TOKEN: ${{ secrets.PAT_GITHUB }}
-      GITHUB_TOKEN: ${{ secrets.PAT_GITHUB }}
       NPM_TOKEN: ${{ secrets.BROWSER_NPM_TOKEN }}
-      NODE_AUTH_TOKEN: ${{ secrets.BROWSER_NPM_TOKEN }}
 
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          token: ${{ secrets.PAT_GITHUB }}
-
-      - name: login
+          node-version: lts/*
+      - name: authenticate
         run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-          git remote set-url origin https://${{github.actor}}:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY
           npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
 
       - name: install
@@ -31,6 +32,9 @@ jobs:
       - name: sync versions
         run: npm run sync:version
 
+      - name: build:npm
+        run: npm run build:npm
+
       - name: publish
         run: |
           npm publish
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -8,7 +8,12 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
+
     env:
       NEWRELIC_ENVIRONMENT: ci
       JIL_SAUCE_LABS_USERNAME: ${{ secrets.JIL_SAUCE_LABS_USERNAME }}
@@ -18,7 +23,12 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: build:all
@@ -27,7 +37,11 @@ jobs:
         run: node ./tools/jil/bin/cli.js -f merged -b chrome@latest -s -t 85000 --concurrent=10
   publish-to-s3:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [test]
     env:
       NEWRELIC_ENVIRONMENT: ci
@@ -38,7 +52,12 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: sync versions
@@ -56,13 +75,22 @@ jobs:
         run: node tools/scripts/check-version.js -e yes -m
   publish-to-internal-prod:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [publish-to-s3]
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: sync versions
@@ -108,7 +136,11 @@ jobs:
             --purge-internal
   publish-to-nrdb:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [publish-to-s3]
     env:
       NEWRELIC_ENVIRONMENT: ci
@@ -119,7 +151,12 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: sync versions
@@ -139,13 +176,24 @@ jobs:
           node tools/scripts/check-nrdb.js -v ${{steps.build_versions.outputs.CDN_VERSION}}
   raise-release-notes-pr:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [publish-to-nrdb]
     env:
       NEWRELIC_ENVIRONMENT: ci
       GITHUB_TOKEN: ${{ secrets.DOCS_SITE_FORK_TOKEN }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.DOCS_SITE_FORK_TOKEN }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: sync versions
@@ -161,13 +209,22 @@ jobs:
             -t=${{steps.build_versions.outputs.CDN_VERSION}}}
   publish-current-to-s3:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [publish-to-nrdb]
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: sync versions
@@ -185,26 +242,30 @@ jobs:
             -e yes
   publish-npm:
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
     needs: [publish-to-nrdb]
     env:
-      GH_TOKEN: ${{ secrets.PAT_GITHUB }}
-      GITHUB_TOKEN: ${{ secrets.PAT_GITHUB }}
       NPM_TOKEN: ${{ secrets.BROWSER_NPM_TOKEN }}
-      NODE_AUTH_TOKEN: ${{ secrets.BROWSER_NPM_TOKEN }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          token: ${{ secrets.PAT_GITHUB }}
-      - name: login
+          node-version: lts/*
+      - name: authenticate
         run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-          git remote set-url origin https://${{github.actor}}:${GH_TOKEN}@github.com/$GITHUB_REPOSITORY
           npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
       - name: install
         run: npm ci
       - name: force versions to sync
         run: npm run sync:version
+      - name: build:npm
+        run: npm run build:npm
       - name: publish
         run: |
           npm publish
diff --git a/.github/workflows/raise-release-notes-pr.yml b/.github/workflows/raise-release-notes-pr.yml
@@ -11,7 +11,14 @@ jobs:
       NEWRELIC_ENVIRONMENT: ci
       GITHUB_TOKEN: ${{ secrets.DOCS_SITE_FORK_TOKEN }}
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.DOCS_SITE_FORK_TOKEN }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: install
         run: npm ci
       - name: get version
diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml
@@ -6,28 +6,32 @@ on:
     # Runs every day at 3AM
     - cron: '0 3 * * *'
 
-
 env:
   BUILD_NUMBER: event-${{ github.event.number }}-job-${{ github.run_number }}-attempt-${{ github.run_attempt }}
 
 jobs:
   chrome:
-    if: contains(fromJson('["schedule"]'), github.event_name) || contains(fromJson('["workflow_dispatch"]'), github.event_name)
     runs-on: ubuntu-latest
-    container: node:14
-    
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
+
     env:
       NEWRELIC_ENVIRONMENT: ci
       JIL_SAUCE_LABS_USERNAME: ${{ secrets.JIL_SAUCE_LABS_USERNAME }}
       JIL_SAUCE_LABS_ACCESS_KEY: ${{ secrets.JIL_SAUCE_LABS_ACCESS_KEY }}
       NEW_RELIC_LICENSE_KEY: ${{ secrets.JIL_NODE_NEW_RELIC_LICENSE_KEY }}
 
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: checkout and build
         uses: ./.github/actions/test-setup
-
       - name: run tests
         run: node --max-old-space-size=8192 ./tools/jil/bin/cli.js -f merged -b chrome@latest -s -t 85000 --concurrent=10
-
-  
diff --git a/.github/workflows/tests-polyfill.yml b/.github/workflows/tests-polyfill.yml
@@ -11,10 +11,13 @@ env:
   BUILD_NUMBER: polyfills-${{ github.event.number }}-job-${{ github.run_number }}-attempt-${{ github.run_attempt }}
 
 jobs:
-  ie-functional:
-    timeout-minutes: 90
+  ie:
     runs-on: ubuntu-latest
-    container: node:14
+    container:
+      image: ubuntu:latest
+    defaults:
+      run:
+        shell: bash
 
     env:
       NEWRELIC_ENVIRONMENT: ci
@@ -23,27 +26,13 @@ jobs:
       NEW_RELIC_LICENSE_KEY: ${{ secrets.JIL_NODE_NEW_RELIC_LICENSE_KEY }}
 
     steps:
+      - name: Setup Container
+        run: apt update && apt install -y git
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
       - name: checkout and build
         uses: ./.github/actions/test-setup
-
-      - name: run tests
-        run: node --max-old-space-size=8192 ./tools/jil/bin/cli.js -P -b ie@* -s -t 85000 --concurrent=5 --functional-only
-  ie-unit:
-    timeout-minutes: 90
-    runs-on: ubuntu-latest
-    container: node:14
-
-    env:
-      NEWRELIC_ENVIRONMENT: ci
-      JIL_SAUCE_LABS_USERNAME: ${{ secrets.JIL_SAUCE_LABS_USERNAME }}
-      JIL_SAUCE_LABS_ACCESS_KEY: ${{ secrets.JIL_SAUCE_LABS_ACCESS_KEY }}
-      NEW_RELIC_LICENSE_KEY: ${{ secrets.JIL_NODE_NEW_RELIC_LICENSE_KEY }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: checkout and build
-        uses: ./.github/actions/test-setup
-
       - name: run tests
-        run: node --max-old-space-size=8192 ./tools/jil/bin/cli.js -P -b ie@* -s -t 85000 --concurrent=5 --unit-only
+        run: node --max-old-space-size=8192 ./tools/jil/bin/cli.js -P -b ie@11 -s -t 85000 --concurrent=10
diff --git a/tests/functional/npm/basic.test.js b/tests/functional/npm/basic.test.js
@@ -5,7 +5,7 @@
 
 const testDriver = require('../../../tools/jil/index')
 
-const matcher = testDriver.Matcher.withFeature('notSafariWithSeleniumBug')
+const matcher = testDriver.Matcher.withFeature('notSafariWithSeleniumBug').and(testDriver.Matcher.withFeature('notInternetExplorer'))
 
 const testBuilds = [
   'browser-agent',
