From e824ac424d0067e1846164f01b070327f9c37808 Mon Sep 17 00:00:00 2001
From: webzwo0i <webzwo0i@c3d2.de>
Date: Sun, 22 Nov 2020 23:45:52 +0100
Subject: [PATCH] frontend workflow: use github.job as tunnelidentifier for
 saucelabs also rm default frontend tests when running with plugins installed

---
 .github/workflows/frontend-tests.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 558a37755..d42ba7979 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -35,7 +35,7 @@ jobs:
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}
+        TRAVIS_JOB_NUMBER: ${{ github.job }}
         GIT_HASH: ${{ steps.environment.outputs.sha_short }}
       run: |
         tests/frontend/travis/runner.sh
@@ -53,7 +53,7 @@ jobs:
       env:
         SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
         SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
-        TRAVIS_JOB_NUMBER: ${{ github.run_id }}-${{ github.run_number }}
+        TRAVIS_JOB_NUMBER: ${{ github.job }}
       run: tests/frontend/travis/sauce_tunnel.sh
 
     - name: Install all dependencies and symlink for ep_etherpad-lite
@@ -69,6 +69,10 @@ jobs:
     - name: Write custom settings.json with loglevel WARN
       run: "sed 's/\"loglevel\": \"INFO\",/\"loglevel\": \"WARN\",/' < settings.json.template > settings.json"
 
+      # XXX we should probably run all tests, because plugins could effect their results
+    - name: Remove standard frontend test files, so only plugin tests are run
+      run: rm tests/frontend/specs/*
+
     - name: Run the frontend tests
       shell: bash
       env: