Systemd container rename

saltstack · Nov 8, 2024 · 0fb2ff1 · 0fb2ff1
1 parent 742a9dd
commit 0fb2ff1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1104,7 +1104,7 @@ jobs:
       distro-slug: ubuntu-22.04
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb
@@ -1126,7 +1126,7 @@ jobs:
       distro-slug: ubuntu-22.04-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1227,7 +1227,7 @@ jobs:
       distro-slug: ubuntu-22.04
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb
@@ -1249,7 +1249,7 @@ jobs:
       distro-slug: ubuntu-22.04-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -1143,7 +1143,7 @@ jobs:
       distro-slug: ubuntu-22.04
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb
@@ -1165,7 +1165,7 @@ jobs:
       distro-slug: ubuntu-22.04-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -1209,7 +1209,7 @@ jobs:
       distro-slug: ubuntu-22.04
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: x86_64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb
@@ -1231,7 +1231,7 @@ jobs:
       distro-slug: ubuntu-22.04-arm64
       nox-session: ci-test-onedir
       platform: linux
-      container: ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd
+      container: ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04
       arch: arm64
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: deb

diff --git a/.github/workflows/test-packages-action-linux.yml b/.github/workflows/test-packages-action-linux.yml
@@ -200,7 +200,7 @@ jobs:
       #    chmod +x /usr/bin/systemctl
       - name: install pkg test
         run: |
-          dpkg -i ./artifacts/pkg/salt-common-${{ inputs.salt-version}}_${{ inputs.arch }}.deb ./artifacts/pkg/salt-master-${{ inputs.salt-version}}_${{ inputs.arch }}.deb
+          dpkg -i ./artifacts/pkg/salt-common-${{ inputs.salt-version}}_${{ inputs.arch == 'x86_64' && 'amd64' || 'arm64' }}.deb ./artifacts/pkg/salt-master-${{ inputs.salt-version}}_${{ inputs.arch == 'x86_64' && 'amd64' || 'arm64' }}.deb
 
       - name: Show System Info
         env:

diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py
@@ -441,14 +441,14 @@ def generate_workflows(ctx: Context):
                     display_name="Ubuntu 22.04",
                     arch="x86_64",
                     pkg_type="deb",
-                    container="ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd",
+                    container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04",
                 ),
                 Linux(
                     slug="ubuntu-22.04-arm64",
                     display_name="Ubuntu 22.04 Arm64",
                     arch="arm64",
                     pkg_type="deb",
-                    container="ghcr.io/saltstack/salt-ci-containers/testing:ubuntu-22.04-systemd",
+                    container="ghcr.io/saltstack/salt-ci-containers/testing:systemd-ubuntu-22.04",
                 ),
                 Linux(
                     slug="ubuntu-24.04",