More systemd

.github/workflows/build-deps-ci-action.yml

@@ -182,7 +182,7 @@ jobs:
     name: MacOS
     needs:
       - generate-matrix
-    runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-14' || matrix.distro-slug }}
+    runs-on: ${{ matrix.distro-slug }}
     if: ${{ inputs.kind  == 'macos' }}
     timeout-minutes: 90
     strategy:

.github/workflows/ci.yml

@@ -602,7 +602,7 @@ jobs:
       distro-slug: rockylinux-8
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -624,7 +624,7 @@ jobs:
       distro-slug: rockylinux-8-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -646,7 +646,7 @@ jobs:
       distro-slug: rockylinux-9
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -668,7 +668,7 @@ jobs:
       distro-slug: rockylinux-9-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -956,7 +956,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -978,7 +978,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1000,7 +1000,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1023,7 +1023,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm

.github/workflows/nightly.yml

@@ -725,7 +725,7 @@ jobs:
       distro-slug: rockylinux-8
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -747,7 +747,7 @@ jobs:
       distro-slug: rockylinux-8-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -769,7 +769,7 @@ jobs:
       distro-slug: rockylinux-9
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -791,7 +791,7 @@ jobs:
       distro-slug: rockylinux-9-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1079,7 +1079,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1101,7 +1101,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1123,7 +1123,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1146,7 +1146,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm

.github/workflows/scheduled.yml

@@ -641,7 +641,7 @@ jobs:
       distro-slug: rockylinux-8
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -663,7 +663,7 @@ jobs:
       distro-slug: rockylinux-8-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -685,7 +685,7 @@ jobs:
       distro-slug: rockylinux-9
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -707,7 +707,7 @@ jobs:
       distro-slug: rockylinux-9-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -995,7 +995,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1017,7 +1017,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1039,7 +1039,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1062,7 +1062,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm

.github/workflows/staging.yml

@@ -707,7 +707,7 @@ jobs:
       distro-slug: rockylinux-8
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -729,7 +729,7 @@ jobs:
       distro-slug: rockylinux-8-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -751,7 +751,7 @@ jobs:
       distro-slug: rockylinux-9
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -773,7 +773,7 @@ jobs:
       distro-slug: rockylinux-9-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1061,7 +1061,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1083,7 +1083,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1105,7 +1105,7 @@ jobs:
       distro-slug: photonos-5
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm
@@ -1128,7 +1128,7 @@ jobs:
       distro-slug: photonos-5-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:photon-5
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: rpm

tools/ci.py

@@ -930,7 +930,8 @@ def get_ci_deps_matrix(ctx: Context):
             {"arch": "x86_64"},
         ],
         "macos": [
-            {"distro-slug": "macos-12", "arch": "x86_64"},
+            {"distro-slug": "macos-13", "arch": "x86_64"},
+            {"distro-slug": "macos-14", "arch": "arm64"},
         ],
         "windows": [
             {"distro-slug": "windows-2022", "arch": "amd64"},
@@ -939,14 +940,6 @@ def get_ci_deps_matrix(ctx: Context):
     if "LINUX_ARM_RUNNER" in os.environ and os.environ["LINUX_ARM_RUNNER"] != "0":
         _matrix["linux"].append({"arch": "arm64"})
 
-    if gh_event["repository"]["fork"] is not True:
-        _matrix["macos"].append(
-            {
-                "distro-slug": "macos-13-arm64",
-                "arch": "arm64",
-            }
-        )
-
     ctx.info("Generated matrix:")
     ctx.print(_matrix, soft_wrap=True)
 

tools/precommit/workflows.py

@@ -229,28 +229,28 @@ TEST_SALT_PKG_LISTING = PlatformDefinitions(
                 display_name="Rocky Linux 8",
                 arch="x86_64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8",
             ),
             LinuxPkg(
                 slug="rockylinux-8-arm64",
                 display_name="Rocky Linux 8 Arm64",
                 arch="arm64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8",
             ),
             LinuxPkg(
                 slug="rockylinux-9",
                 display_name="Rocky Linux 9",
                 arch="x86_64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9",
             ),
             LinuxPkg(
                 slug="rockylinux-9-arm64",
                 display_name="Rocky Linux 9 Arm64",
                 arch="arm64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9",
             ),
             LinuxPkg(
                 slug="amazonlinux-2",
@@ -343,14 +343,14 @@ TEST_SALT_PKG_LISTING = PlatformDefinitions(
                 display_name="Photon OS 5",
                 arch="x86_64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:photon-5",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5",
             ),
             LinuxPkg(
                 slug="photonos-5-arm64",
                 display_name="Photon OS 5 Arm64",
                 arch="arm64",
                 pkg_type="rpm",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:photon-5",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5",
             ),
             LinuxPkg(
                 slug="photonos-5",
@@ -358,7 +358,7 @@ TEST_SALT_PKG_LISTING = PlatformDefinitions(
                 arch="x86_64",
                 pkg_type="rpm",
                 fips=True,
-                container="ghcr.io/saltstack/salt-ci-containers/testing:photon-5",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5",
             ),
             LinuxPkg(
                 slug="photonos-5-arm64",
@@ -366,7 +366,7 @@ TEST_SALT_PKG_LISTING = PlatformDefinitions(
                 arch="arm64",
                 pkg_type="rpm",
                 fips=True,
-                container="ghcr.io/saltstack/salt-ci-containers/testing:photon-5",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5",
             ),
             LinuxPkg(
                 slug="ubuntu-20.04",