fix(onedir): update for onedir salt package

[BREAKING CHANGE] update for onedir salt package
saltstack-formulas · Feb 2, 2024 · c06507f · c06507f
1 parent 3dc21ce
commit c06507f
Show file tree

Hide file tree

Showing 19 changed files with 106 additions and 411 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -150,12 +150,12 @@ default-debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
 default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
 default-centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-35-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
+# default-fedora-35-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@@ -164,37 +164,25 @@ default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 default-almalinux-8-master-py3: {extends: '.test_instance'}
-default-rockylinux-8-master-py3: {extends: '.test_instance'}
-# default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-# default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-# default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-# default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-# default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-# default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-# default-debian-10-3003-4-py3: {extends: '.test_instance'}
-# default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
+default-debian-11-3006-5-py3: {extends: '.test_instance'}
+default-debian-10-3006-5-py3: {extends: '.test_instance'}
+# default-debian-9-3006-5-py3: {extends: '.test_instance'}
+default-ubuntu-2204-3006-5-py3: {extends: '.test_instance_failure_permitted'}
+default-ubuntu-2004-3006-5-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3006-5-py3: {extends: '.test_instance'}
+default-centos-stream8-3006-5-py3: {extends: '.test_instance_failure_permitted'}
+default-centos-7-3006-5-py3: {extends: '.test_instance'}
+# default-fedora-36-3006-5-py3: {extends: '.test_instance_failure_permitted'}
+# default-fedora-35-3006-5-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3006-5-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3006-5-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3006-5-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3006-5-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3006-5-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3006-5-py3: {extends: '.test_instance'}
+default-almalinux-8-3006-5-py3: {extends: '.test_instance'}
+# default-rockylinux-8-3006-5-py3: {extends: '.test_instance'}
 # yamllint enable rule:line-length
 
 ###############################################################################

diff --git a/.travis.yml b/.travis.yml
@@ -99,15 +99,15 @@ jobs:
     # - env: INSTANCE=default-debian-11-master-py3
     - env: INSTANCE=default-debian-10-master-py3
     # - env: INSTANCE=clean-debian-10-master-py3
-    - env: INSTANCE=default-debian-9-master-py3
+    # - env: INSTANCE=default-debian-9-master-py3
     - env: INSTANCE=default-ubuntu-2204-master-py3
     - env: INSTANCE=default-ubuntu-2004-master-py3
-    - env: INSTANCE=default-ubuntu-1804-master-py3
+    # - env: INSTANCE=default-ubuntu-1804-master-py3
     - env: INSTANCE=default-centos-stream8-master-py3
     - env: INSTANCE=default-centos-7-master-py3
-    - env: INSTANCE=default-fedora-36-master-py3
-    - env: INSTANCE=default-fedora-35-master-py3
-    - env: INSTANCE=default-opensuse-leap-153-master-py3
+    # - env: INSTANCE=default-fedora-36-master-py3
+    # - env: INSTANCE=default-fedora-35-master-py3
+    # - env: INSTANCE=default-opensuse-leap-153-master-py3
     # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-oraclelinux-8-master-py3
@@ -116,37 +116,7 @@ jobs:
     # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
     - env: INSTANCE=default-almalinux-8-master-py3
-    - env: INSTANCE=default-rockylinux-8-master-py3
-    # - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    # - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3004-1-py3
-    # - env: INSTANCE=default-fedora-36-3004-1-py3
-    # - env: INSTANCE=default-fedora-35-3004-1-py3
-    # - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    # - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    # - env: INSTANCE=default-almalinux-8-3004-1-py3
-    # - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    # - env: INSTANCE=default-debian-10-3003-4-py3
-    # - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    # - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-almalinux-8-3003-4-py3
+    # - env: INSTANCE=default-rockylinux-8-master-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -28,10 +28,6 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:debian-9
-      run_command: /lib/systemd/systemd
   - name: ubuntu-2204-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-22.04
@@ -40,10 +36,6 @@ platforms:
     driver:
       image: saltimages/salt-tiamat-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
   - name: centos-stream8-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:centos-stream8
@@ -75,10 +67,6 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-master-py3
-    driver:
-      image: saltimages/salt-master-py3:debian-9
-      run_command: /lib/systemd/systemd
   - name: ubuntu-2204-master-py3
     driver:
       image: saltimages/salt-master-py3:ubuntu-22.04
@@ -87,36 +75,12 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
   - name: centos-stream8-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-stream8
   - name: centos-7-master-py3
     driver:
       image: saltimages/salt-master-py3:centos-7
-  - name: fedora-36-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-36
-  - name: fedora-35-master-py3
-    driver:
-      image: saltimages/salt-master-py3:fedora-35
-  - name: opensuse-leap-153-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
   - name: amazonlinux-2-master-py3
     driver:
       image: saltimages/salt-master-py3:amazonlinux-2
@@ -129,134 +93,72 @@ platforms:
   - name: arch-base-latest-master-py3
     driver:
       image: saltimages/salt-master-py3:arch-base-latest
-  - name: gentoo-stage3-latest-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-  - name: gentoo-stage3-systemd-master-py3
-    driver:
-      image: saltimages/salt-master-py3:gentoo-stage3-systemd
   - name: almalinux-8-master-py3
     driver:
       image: saltimages/salt-master-py3:almalinux-8
-  - name: rockylinux-8-master-py3
-    driver:
-      image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3004.1`
-  - name: debian-11-3004-1-py3
+  ## SALT `3006.5`
+  - name: debian-11-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:debian-11
+      image: saltimages/salt-3006.5-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3004-1-py3
+  - name: debian-10-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:debian-10
+      image: saltimages/salt-3006.5-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3004-1-py3
+  - name: debian-9-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:debian-9
+      image: saltimages/salt-3006.5-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2204-3004-1-py3
+  - name: ubuntu-2204-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-22.04
+      image: saltimages/salt-3006.5-py3:ubuntu-22.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3004-1-py3
+  - name: ubuntu-2004-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-20.04
+      image: saltimages/salt-3006.5-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3004-1-py3
+  - name: ubuntu-1804-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-18.04
+      image: saltimages/salt-3006.5-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
-  - name: centos-stream8-3004-1-py3
+  - name: centos-stream8-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:centos-stream8
-  - name: centos-7-3004-1-py3
+      image: saltimages/salt-3006.5-py3:centos-stream8
+  - name: centos-7-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:centos-7
-  - name: fedora-36-3004-1-py3
+      image: saltimages/salt-3006.5-py3:centos-7
+  - name: fedora-36-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:fedora-36
-  - name: fedora-35-3004-1-py3
+      image: saltimages/salt-3006.5-py3:fedora-36
+  - name: fedora-35-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:fedora-35
-  - name: amazonlinux-2-3004-1-py3
+      image: saltimages/salt-3006.5-py3:fedora-35
+  - name: amazonlinux-2-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:amazonlinux-2
-  - name: oraclelinux-8-3004-1-py3
+      image: saltimages/salt-3006.5-py3:amazonlinux-2
+  - name: oraclelinux-8-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-8
-  - name: oraclelinux-7-3004-1-py3
+      image: saltimages/salt-3006.5-py3:oraclelinux-8
+  - name: oraclelinux-7-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-7
-  - name: arch-base-latest-3004-1-py3
+      image: saltimages/salt-3006.5-py3:oraclelinux-7
+  - name: arch-base-latest-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-  - name: gentoo-stage3-latest-3004-1-py3
+      image: saltimages/salt-3006.5-py3:arch-base-latest
+  - name: gentoo-stage3-latest-3006-5-py3
     driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
+      image: saltimages/salt-3006.5-py3:gentoo-stage3-latest
       run_command: /sbin/init
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-  - name: almalinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:almalinux-8
-  - name: rockylinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:rockylinux-8
-
-  ## SALT `3004.0`
-  - name: opensuse-leap-153-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
-    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-  - name: opensuse-tmbl-latest-3004-0-py3
-    driver:
-      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
-    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
-    # => SCP did not finish successfully (255):  (Net::SCP::Error)
-    transport:
-      max_ssh_sessions: 1
-
-  ## SALT `3003.4`
-  - name: debian-10-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: centos-stream8-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:centos-stream8
-  - name: centos-7-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:centos-7
-  - name: amazonlinux-2-3003-4-py3
-    driver:
-      image: saltimages/salt-3003.4-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-4-py3
+  - name: gentoo-stage3-systemd-3006-5-py3
     driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-4-py3
+      image: saltimages/salt-3006.5-py3:gentoo-stage3-systemd
+  - name: almalinux-8-3006-5-py3
     driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-7
-  - name: almalinux-8-3003-4-py3
+      image: saltimages/salt-3006.5-py3:almalinux-8
+  - name: rockylinux-8-3006-5-py3
     driver:
-      image: saltimages/salt-3003.4-py3:almalinux-8
+      image: saltimages/salt-3006.5-py3:rockylinux-8
 
 verifier:
   # https://www.inspec.io/

diff --git a/libvirt/parameters/defaults.yaml b/libvirt/parameters/defaults.yaml
@@ -14,8 +14,7 @@ values:
       - id
   libvirt_pkg: libvirt
   qemu_pkg: qemu
-  python2_pkg: libvirt-python
-  python3_pkg: python3-libvirt
+  pip_pkg: libvirt-python
   libvirt_service: libvirtd
   libvirtd_config: /etc/libvirt/libvirtd.conf
   daemon_config_path: {}

diff --git a/libvirt/parameters/os/AlmaLinux.yaml b/libvirt/parameters/os/AlmaLinux.yaml
@@ -10,5 +10,11 @@
 # values: {}
 ---
 values:
-  python2_pkg: ~
+  qemu_pkg: qemu-kvm
+  extra_pkgs:
+    - python3-devel
+    - libguestfs
+    - libvirt-devel
+    - pkgconf
+  daemon_config_path: /etc/sysconfig
 ...