ci: Update test job definitions

Igalia · Mar 26, 2024 · e88a585 · e88a585
1 parent 4a4ec83
commit e88a585
Showing 1 changed file with 12 additions and 43 deletions.
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -22,45 +22,34 @@ jobs:
           repo_release: 'kirkstone'
     needs: kirkstone-repo
 
-  nanbield-repo:
+  scarthgap-repo:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-repo
         with:
-          repo_release: 'nanbield'
+          repo_release: 'scarthgap'
 
-  nanbield-matrix-wpe-2-44:
+  scarthgap-matrix-wpe-2-44:
     strategy:
       fail-fast: false
       matrix:
         machine: ['raspberrypi3-mesa', 'raspberrypi4-64']
         wpe_vers: ['2_42']
-        yocto_rel: ['nanbield']
+        yocto_rel: ['scarthgap']
     continue-on-error: true
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
-    needs: nanbield-repo
+    needs: scarthgap-repo
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
           bitbake_source: '${{ matrix.machine }}-wpe-${{ matrix.wpe_vers }} ${{ matrix.machine }} poky layers.raspberrypi.webkit conf_v3.wpe-${{ matrix.wpe_vers }}'
           repo_release: ${{ matrix.yocto_rel }}
 
-  nanbield-raspberrypi3-mesa-weston-wpe-qt:
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-build
-        with:
-          bitbake_source: 'raspberrypi3-mesa-wpe-qt raspberrypi3-mesa poky layers.raspberrypi.qt5.webkit conf_v4.wpe-2_44.qt'
-          repo_release: 'nanbield'
-    needs: nanbield-repo
-
-  nanbield-raspberrypi3-mesa-weston-wpe-musl:
+  scarthgap-raspberrypi3-mesa-weston-wpe-musl:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
@@ -69,21 +58,21 @@ jobs:
         with:
           bitbake_source: 'raspberrypi3-mesa-wpe-musl raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_44'
           bitbake_prefix: 'TCLIBC=musl'
-          repo_release: 'nanbield'
-    needs: nanbield-repo
+          repo_release: 'scarthgap'
+    needs: scarthgap-repo
 
-  nanbield-raspberrypi3-mesa-weston-wpe-2-42:
+  scarthgap-raspberrypi3-mesa-weston-wpe-2-42:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/bitbake-build
         with:
           bitbake_source: 'raspberrypi3-mesa-wpe-2-42 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_42'
-          repo_release: 'nanbield'
-    needs: nanbield-repo
+          repo_release: 'scarthgap'
+    needs: scarthgap-repo
 
-  nanbield-raspberrypi3-mesa-weston-gtk:
+  scarthgap-raspberrypi3-mesa-weston-gtk:
     runs-on: self-hosted
     if: "!contains(github.event.head_commit.message, 'ci skip')"
     steps:
@@ -92,26 +81,6 @@ jobs:
         with:
           bitbake_source: 'raspberrypi3-mesa-webkitgtk raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4'
           bitbake_target: 'webkitgtk'
-          repo_release: 'nanbield'
-    needs: nanbield-repo
-
-  scarthgap-repo:
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-repo
-        with:
-          repo_release: 'scarthgap'
-
-  scarthgap-raspberrypi3-mesa-weston-wpe-2-44:
-    runs-on: self-hosted
-    if: "!contains(github.event.head_commit.message, 'ci skip')"
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/bitbake-build
-        with:
-          bitbake_source: 'raspberrypi3-mesa-wpe-2-44 raspberrypi3-mesa poky layers.raspberrypi.webkit conf_v4.wpe-2_44'
           repo_release: 'scarthgap'
     needs: scarthgap-repo