tests: delay setting up saucelabs tunnel

pull/4757/head
webzwo0i 2021-02-15 16:35:04 +01:00 committed by Richard Hansen
parent 6198e92706
commit 29afb91b3e
2 changed files with 18 additions and 20 deletions

View File

@ -15,12 +15,6 @@ jobs:
with: with:
node-version: 12 node-version: 12
- uses: saucelabs/sauce-connect-action@v1.1.2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
- name: Install etherpad plugins - name: Install etherpad plugins
# We intentionally install an old ep_align version to test upgrades to the minor version number. # We intentionally install an old ep_align version to test upgrades to the minor version number.
# The --legacy-peer-deps flag is required to work around a bug in npm v7: # The --legacy-peer-deps flag is required to work around a bug in npm v7:
@ -54,6 +48,12 @@ jobs:
- name: Remove standard frontend test files, so only admin tests are run - name: Remove standard frontend test files, so only admin tests are run
run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
- uses: saucelabs/sauce-connect-action@v1.1.2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
- name: Run the frontend admin tests - name: Run the frontend admin tests
shell: bash shell: bash
env: env:

View File

@ -15,12 +15,6 @@ jobs:
with: with:
node-version: 12 node-version: 12
- uses: saucelabs/sauce-connect-action@v1.1.2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
- name: Install all dependencies and symlink for ep_etherpad-lite - name: Install all dependencies and symlink for ep_etherpad-lite
run: src/bin/installDeps.sh run: src/bin/installDeps.sh
@ -31,6 +25,12 @@ jobs:
- name: Write custom settings.json with loglevel WARN - name: Write custom settings.json with loglevel WARN
run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json" run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
- uses: saucelabs/sauce-connect-action@v1.1.2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
- name: Run the frontend tests - name: Run the frontend tests
shell: bash shell: bash
env: env:
@ -53,14 +53,6 @@ jobs:
with: with:
node-version: 12 node-version: 12
- name: Run sauce-connect-action
shell: bash
env:
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
run: src/tests/frontend/travis/sauce_tunnel.sh
- name: Install Etherpad plugins - name: Install Etherpad plugins
# The --legacy-peer-deps flag is required to work around a bug in npm v7: # The --legacy-peer-deps flag is required to work around a bug in npm v7:
# https://github.com/npm/cli/issues/2199 # https://github.com/npm/cli/issues/2199
@ -104,6 +96,12 @@ jobs:
- name: Remove standard frontend test files, so only plugin tests are run - name: Remove standard frontend test files, so only plugin tests are run
run: rm src/tests/frontend/specs/* run: rm src/tests/frontend/specs/*
- uses: saucelabs/sauce-connect-action@v1.1.2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelIdentifier: ${{ github.run_id }}-${{ github.run_number }}-${{ github.job }}
- name: Run the frontend tests - name: Run the frontend tests
shell: bash shell: bash
env: env: