Merge pull request #358 from Webperf-se/issue-357

use sites.json as input for github actions
Webperf-se · Apr 3, 2024 · 88b6710 · 88b6710
2 parents 8b8633d + d6a7374
commit 88b6710
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 42 deletions.
diff --git a/.github/workflows/regression-test-404.yml b/.github/workflows/regression-test-404.yml
@@ -35,10 +35,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-a11y-statement.yml b/.github/workflows/regression-test-a11y-statement.yml
@@ -35,10 +35,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://polisen.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://polisen.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-css.yml b/.github/workflows/regression-test-css.yml
@@ -62,10 +62,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-email.yml b/.github/workflows/regression-test-email.yml
@@ -47,10 +47,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-google-lighthouse-based.yml b/.github/workflows/regression-test-google-lighthouse-based.yml
@@ -16,7 +16,6 @@ jobs:
                 os: [ubuntu-latest, windows-latest]
                 config: ['REVIEW_SHOW_IMPROVEMENTS_ONLY=True,LIGHTHOUSE_USE_API=False']
                 version: [1, 4, 5, 8, 10, 22]
-                #version: [1, 4, 8, 10, 22]
     steps:
     - name: Check out repository code
       uses: actions/checkout@v4
@@ -40,10 +39,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-html.yml b/.github/workflows/regression-test-html.yml
@@ -62,10 +62,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-http.yml b/.github/workflows/regression-test-http.yml
@@ -54,10 +54,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-pa11y.yml b/.github/workflows/regression-test-pa11y.yml
@@ -37,10 +37,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-20.04' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-sitespeed.yml b/.github/workflows/regression-test-sitespeed.yml
@@ -72,10 +72,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-software.yml b/.github/workflows/regression-test-software.yml
@@ -51,10 +51,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .\.github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-standard-files.yml b/.github/workflows/regression-test-standard-files.yml
@@ -35,10 +35,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-tracking.yml b/.github/workflows/regression-test-tracking.yml
@@ -106,10 +106,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .\.github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-translations.yml b/.github/workflows/regression-test-translations.yml
@@ -37,5 +37,5 @@ jobs:
         git config --global user.name 'GitHub Action'
         git config --global user.email '[email protected]'
         git add locales/
-        git commit -m "Add changed Translation(s) if any"
+        git commit -m "Added changed Translation(s)"
         git push
diff --git a/.github/workflows/regression-test-webbkoll.yml b/.github/workflows/regression-test-webbkoll.yml
@@ -35,10 +35,10 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
diff --git a/.github/workflows/regression-test-ylt.yml b/.github/workflows/regression-test-ylt.yml
@@ -45,11 +45,11 @@ jobs:
     - if: ${{ matrix.os == 'ubuntu-latest' }}
       name: RUNNING TEST - LINUX
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github/workflows/testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github/workflows/testresult-${{ matrix.version }}.json
          python .github/workflows/verify_result.py -t ${{ matrix.version }}
     - if: ${{ matrix.os == 'windows-latest' }}
       name: RUNNING TEST - WINDOWS
       run: |
-         python default.py -t ${{ matrix.version }} -r -u https://webperf.se/ -o .github\workflows\testresult-${{ matrix.version }}.json
+         python default.py -t ${{ matrix.version }} -r -i sites.json -o .github\workflows\testresult-${{ matrix.version }}.json
          python .github\workflows\verify_result.py -t ${{ matrix.version }}
       
diff --git a/docs/getting-started-github-actions.md b/docs/getting-started-github-actions.md
@@ -5,7 +5,7 @@ If you want to test/verify private websites you should probably look at one of t
 
 ## How to setup
 - [Fork webperf-core repository](https://github.com/Webperf-se/webperf_core/fork?fragment=1)
-- Remove tests you don't want from your `./github/workflows/` folder (You probably only want `codeql-analysis.yml` and `regression-test-translations.yml` if you are contributing).
+- Remove tests you don't need from your `./github/workflows/` folder (You only need: `close-inactive-issues.yml`, `codeql-analysis.yml`, `pylint.yml`, `regression-test-translations.yml` and `update-software.yml` if you are contributing and are working on a Pull Request).
 - Rest of the steps depend on how you want to run/trigger the test, see below
 
 ### Triggeron Push or Pull request
@@ -14,7 +14,8 @@ Choose this option if you want to [contribute](CONTRIBUTING.md) or have your own
 
 #### How to setup:
 
-- Change `https://webperf.se/` in all `.yml` files to the url you want to test with.
+- Change `https://webperf.se/` in `sites.json` file to the url you want to test with.
+  (If you want to test more then one, add them)
 - Now every time you push new changes or create a pull request all `.yml` tests will run.
 
 ### Trigger on a Schedule

diff --git a/sites.json b/sites.json
@@ -1,11 +1,8 @@
-{ "sites": [
-    {
-        "id": 0,
-        "url": "https://webperf.se/"
-    },
-    {
-        "id": 1,
-        "url": "https://surfalugnt.se/"
-    }
-]
+{
+    "sites": [
+        {
+            "id": 0,
+            "url": "https://webperf.se/"
+        }
+    ]
 }