Fix macos runner names

Author: dwoz

.github/workflows/test-action.yml

@@ -985,7 +985,7 @@ jobs:
     name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}${{ matrix.test-group && ' ' || '' }}${{ matrix.test-group && matrix.test-group || '' }}
 
     if: ${{ !cancelled() && toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
-    runs-on: ${{ matrix.slug }}
+    runs-on: ${{ matrix.runner }}
     # Full test runs. Each chunk should never take more than 2 hours.
     # Partial test runs(no chunk parallelization), 6 Hours
     timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}

.github/workflows/test-packages-action.yml

@@ -319,7 +319,7 @@ jobs:
 
   test-windows:
     name: ${{ matrix.display_name }} ${{ matrix.pkg_type }} ${{ matrix.tests-chunk }} ${{ matrix.version }}
-    runs-on: ${{ matrix.slug }}
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     if: ${{ !cancelled() && toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
     strategy:

cicd/shared-gh-workflows-context.yml

@@ -1,6 +1,9 @@
 nox_version: "2022.8.7"
 python_version: "3.10.19"
 relenv_version: "0.22.4"
+release_branches:
+  - "3006.x"
+  - "3007.x"
 pr-testrun-slugs:
   - ubuntu-24.04-pkg
   - ubuntu-24.04
@@ -138,12 +141,14 @@ test-salt-listing:
       enabled: false
   macos:
     - slug: macos-15-intel
-      display_name: "macOS 15"
+      display_name: "macOS 15 (Intel)"
       arch: x86_64
+      runner: macos-15-intel
       enabled: true
     - slug: macos-15
       display_name: "macOS 15 (M1)"
       arch: arm64
+      runner: macos-15
       enabled: true
   windows:
     - slug: windows-2022
@@ -279,32 +284,38 @@ test-salt-pkg-listing:
       container: "ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-24.04"
       enabled: false
   macos:
-    - slug: macos-13-intel-pkg
-      display_name: "macOS 15"
+    - slug: macos-15-intel-pkg
+      display_name: "macOS 15 (Intel)"
       arch: x86_64
+      runner: macos-15-intel
       enabled: true
     - slug: macos-15-pkg
       display_name: "macOS 15 (M1)"
       arch: arm64
+      runner: macos-15
       enabled: true
   windows:
-    - slug: windows-2022-pkg
+    - slug: windows-2022-nsis-pkg
       display_name: "Windows 2022"
       arch: amd64
+      runner: windows-2022
       pkg_type: NSIS
       enabled: true
-    - slug: windows-2022-pkg
+    - slug: windows-2022-msi-pkg
       display_name: "Windows 2022"
       arch: amd64
+      runner: windows-2022
       pkg_type: MSI
       enabled: true
-    - slug: windows-2025-pkg
+    - slug: windows-2025-nsis-pkg
       display_name: "Windows 2025"
       arch: amd64
+      runner: windows-2025
       pkg_type: NSIS
       enabled: true
-    - slug: windows-2025-pkg
+    - slug: windows-2025-msi-pkg
       display_name: "Windows 2025"
       arch: amd64
+      runner: windows-2025
       pkg_type: MSI
       enabled: true

tools/testsuite/download.py

@@ -259,7 +259,7 @@ def download_artifact(
             "help": "The workflow run ID from where to download artifacts from",
         },
         "slug": {
-            "help": "Slug of the test run (examples: debian-11, macos-13, windows-2022)",
+            "help": "Slug of the test run (examples: debian-11, macos-15-intel, windows-2022)",
         },
         "repository": {
             "help": "The repository to query, e.g. saltstack/salt",

tools/utils/__init__.py

@@ -60,6 +60,11 @@ class OS:
     display_name: str = attr.ib(default=None)
     pkg_type: str = attr.ib(default=None)
     enabled: bool = attr.ib(default=True)
+    runner: str = attr.ib()
+
+    @runner.default
+    def _default_runner(self):
+        return self.slug
 
     @arch.default
     def _default_arch(self):
@@ -90,6 +95,8 @@ def as_dict(self):
             "arch": self.arch,
             "display_name": self.display_name,
             "pkg_type": self.pkg_type,
+            "enabled": self.enabled,
+            "runner": self.runner,
             "fips": self.fips,
             "container": self.container,
             "job_name": self.job_name,
@@ -106,13 +113,8 @@ def job_name(self):
 
 @attr.s(frozen=True, slots=True)
 class MacOS(OS):
-    runner: str = attr.ib()
     platform: str = attr.ib(default="macos")
 
-    @runner.default
-    def _default_runner(self):
-        return self.slug
-
     @property
     def job_name(self):
         return f"test-{ self.slug.replace('.', '') }"
@@ -124,6 +126,7 @@ def as_dict(self):
             "arch": self.arch,
             "display_name": self.display_name,
             "pkg_type": self.pkg_type,
+            "enabled": self.enabled,
             "runner": self.runner,
             "job_name": self.job_name,
         }
@@ -155,6 +158,8 @@ def as_dict(self):
             "arch": self.arch,
             "display_name": self.display_name,
             "pkg_type": self.pkg_type,
+            "enabled": self.enabled,
+            "runner": self.runner,
             "job_name": self.job_name,
         }
 
@@ -406,10 +411,10 @@ def get_platform_and_arch_from_slug(slug: str) -> tuple[str, str]:
         arch = "amd64"
     elif "macos" in slug:
         platform = "macos"
-        if "macos-13" in slug and "xlarge" in slug:
-            arch = "arm64"
-        else:
+        if "intel" in slug:
             arch = "x86_64"
+        else:
+            arch = "arm64"
     else:
         platform = "linux"
         if "arm64" in slug: