remove ubuntu 18.04 from the package tests, we are no longer testing on it. Also supply the minion_tgt for test_services

.github/workflows/ci.yml

@@ -536,22 +536,6 @@ jobs:
       pkg-type: deb
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
-
-  ubuntu-1804-pkg-tests:
-    name: Ubuntu 18.04 Package Tests
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    needs:
-      - prepare-workflow
-      - build-pkgs
-    uses: ./.github/workflows/test-packages-action.yml
-    with:
-      distro-slug: ubuntu-18.04
-      platform: linux
-      arch: x86_64
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      pkg-type: deb
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1123,7 +1107,6 @@ jobs:
       - debian-10-pkg-tests
       - debian-11-pkg-tests
       - debian-11-arm64-pkg-tests
-      - ubuntu-1804-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

.github/workflows/nightly.yml

@@ -534,22 +534,6 @@ jobs:
       pkg-type: deb
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
-
-  ubuntu-1804-pkg-tests:
-    name: Ubuntu 18.04 Package Tests
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    needs:
-      - prepare-workflow
-      - build-pkgs
-    uses: ./.github/workflows/test-packages-action.yml
-    with:
-      distro-slug: ubuntu-18.04
-      platform: linux
-      arch: x86_64
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      pkg-type: deb
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1131,7 +1115,6 @@ jobs:
       - debian-10-pkg-tests
       - debian-11-pkg-tests
       - debian-11-arm64-pkg-tests
-      - ubuntu-1804-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

.github/workflows/scheduled.yml

@@ -534,22 +534,6 @@ jobs:
       pkg-type: deb
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
-
-  ubuntu-1804-pkg-tests:
-    name: Ubuntu 18.04 Package Tests
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    needs:
-      - prepare-workflow
-      - build-pkgs
-    uses: ./.github/workflows/test-packages-action.yml
-    with:
-      distro-slug: ubuntu-18.04
-      platform: linux
-      arch: x86_64
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      pkg-type: deb
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-
   ubuntu-2004-pkg-tests:
     name: Ubuntu 20.04 Package Tests
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@@ -1121,7 +1105,6 @@ jobs:
       - debian-10-pkg-tests
       - debian-11-pkg-tests
       - debian-11-arm64-pkg-tests
-      - ubuntu-1804-pkg-tests
       - ubuntu-2004-pkg-tests
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests

.github/workflows/templates/ci.yml.jinja

@@ -426,23 +426,6 @@ on:
       pkg-type: deb
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
 
-
-  ubuntu-1804-pkg-tests:
-    <%- do test_salt_needs.append('ubuntu-1804-pkg-tests') %>
-    name: Ubuntu 18.04 Package Tests
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
-    needs:
-      - prepare-workflow
-      - build-pkgs
-    uses: ./.github/workflows/test-packages-action.yml
-    with:
-      distro-slug: ubuntu-18.04
-      platform: linux
-      arch: x86_64
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      pkg-type: deb
-      cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
-
   ubuntu-2004-pkg-tests:
     <%- do test_salt_needs.append('ubuntu-2004-pkg-tests') %>
     name: Ubuntu 20.04 Package Tests

pkg/tests/integration/test_enabled_disabled.py

@@ -24,7 +24,17 @@ def test_services(install_salt, salt_cli, salt_minion):
         pytest.fail(f"Don't know how to handle os_family={install_salt.distro_id}")
 
     for service in services_enabled:
-        assert "true" in salt_cli.run("service.enabled", service).stdout
+        assert (
+            "true"
+            in salt_cli.run(
+                "service.enabled", service, minion_tgt=salt_minion.id
+            ).stdout
+        )
 
     for service in services_disabled:
-        assert "true" in salt_cli.run("service.disabled", service).stdout
+        assert (
+            "true"
+            in salt_cli.run(
+                "service.disabled", service, minion_tgt=salt_minion.id
+            ).stdout
+        )