ci(kitchen): move provisioner block & update run_command [skip ci]

* Automated using myii/ssf-formula#344

kitchen.windows.yml

@@ -9,10 +9,10 @@ driver:
  username: kitchen
  password: Pass@word1
 
-platforms:
- - name: windows-2019-latest-py3
- - name: windows-2016-latest-py3
-
 provisioner:
  salt_install: bootstrap
  salt_bootstrap_options: -pythonVersion 3
+
+platforms:
+ - name: windows-2019-latest-py3
+ - name: windows-2016-latest-py3

kitchen.yml

@@ -6,7 +6,17 @@ driver:
  name: docker
  use_sudo: false
  privileged: true
- run_command: /lib/systemd/systemd
+ run_command: /usr/lib/systemd/systemd
+
+provisioner:
+ name: salt_solo
+ log_level: debug
+ salt_install: none
+ require_chef: false
+ formula: packages
+ salt_copy_filter:
+ - .kitchen
+ - .git
 
 platforms:
  ## SALT `tiamat`
@@ -17,19 +27,23 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-tiamat-py3
  driver:
  image: saltimages/salt-tiamat-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-2004-tiamat-py3
  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-8-tiamat-py3
  driver:
  image: saltimages/salt-tiamat-py3:centos-8
@@ -60,19 +74,23 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-master-py3
  driver:
  image: saltimages/salt-master-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-2004-master-py3
  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-8-master-py3
  driver:
  image: saltimages/salt-master-py3:centos-8
@@ -88,23 +106,20 @@ platforms:
  - name: opensuse-leap-153-master-py3
  driver:
  image: saltimages/salt-master-py3:opensuse-leap-15.3
- run_command: /usr/lib/systemd/systemd
  # 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-leap-152-master-py3
  driver:
  image: saltimages/salt-master-py3:opensuse-leap-15.2
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
  # => 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
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
@@ -121,7 +136,6 @@ platforms:
  - name: arch-base-latest-master-py3
  driver:
  image: saltimages/salt-master-py3:arch-base-latest
- run_command: /usr/lib/systemd/systemd
  - name: gentoo-stage3-latest-master-py3
  driver:
  image: saltimages/salt-master-py3:gentoo-stage3-latest
@@ -144,19 +158,23 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:ubuntu-20.04
+ run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:ubuntu-18.04
+ run_command: /lib/systemd/systemd
  - name: centos-8-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:centos-8
@@ -172,23 +190,20 @@ platforms:
  - name: opensuse-leap-153-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:opensuse-leap-15.3
- run_command: /usr/lib/systemd/systemd
  # 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-leap-152-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:opensuse-leap-15.2
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
  max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:opensuse-tumbleweed-latest
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
@@ -205,7 +220,6 @@ platforms:
  - name: arch-base-latest-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:arch-base-latest
- run_command: /usr/lib/systemd/systemd
  - name: gentoo-stage3-latest-3003-1-py3
  driver:
  image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
@@ -222,19 +236,23 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:ubuntu-20.04
+ run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:ubuntu-18.04
+ run_command: /lib/systemd/systemd
  - name: centos-8-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:centos-8
@@ -259,7 +277,6 @@ platforms:
  - name: arch-base-latest-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:arch-base-latest
- run_command: /usr/lib/systemd/systemd
  - name: gentoo-stage3-latest-3002-6-py3
  driver:
  image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
@@ -272,23 +289,20 @@ platforms:
  - name: opensuse-leap-153-3002-2-py3
  driver:
  image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
- run_command: /usr/lib/systemd/systemd
  # 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-leap-152-3002-2-py3
  driver:
  image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
  max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-3002-2-py3
  driver:
  image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
@@ -302,19 +316,23 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-2004-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:ubuntu-20.04
+ run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:ubuntu-18.04
+ run_command: /lib/systemd/systemd
  - name: centos-8-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:centos-8
@@ -330,23 +348,20 @@ platforms:
  - name: opensuse-leap-153-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
- run_command: /usr/lib/systemd/systemd
  # 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-leap-152-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
  max_ssh_sessions: 1
  - name: opensuse-tmbl-latest-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
@@ -363,7 +378,6 @@ platforms:
  - name: arch-base-latest-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:arch-base-latest
- run_command: /usr/lib/systemd/systemd
  - name: gentoo-stage3-latest-3001-7-py3
  driver:
  image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
@@ -380,16 +394,19 @@ platforms:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: debian-9-3000-9-py3
  driver:
  image: saltimages/salt-3000.9-py3:debian-9
  provision_command:
  - apt-get update
  - apt-get install --reinstall -y udev
  - apt-get install -y snapd
+ run_command: /lib/systemd/systemd
  - name: ubuntu-1804-3000-9-py3
  driver:
  image: saltimages/salt-3000.9-py3:ubuntu-18.04
+ run_command: /lib/systemd/systemd
  - name: centos-8-3000-9-py3
  driver:
  image: saltimages/salt-3000.9-py3:centos-8
@@ -399,15 +416,13 @@ platforms:
  - name: opensuse-leap-153-3000-9-py3
  driver:
  image: saltimages/salt-3000.9-py3:opensuse-leap-15.3
- run_command: /usr/lib/systemd/systemd
  # 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-leap-152-3000-9-py3
  driver:
  image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
- run_command: /usr/lib/systemd/systemd
  # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
  # => SCP did not finish successfully (255): (Net::SCP::Error)
  transport:
@@ -431,20 +446,10 @@ platforms:
  - name: ubuntu-1804-3000-9-py2
  driver:
  image: saltimages/salt-3000.9-py2:ubuntu-18.04
+ run_command: /lib/systemd/systemd
  - name: arch-base-latest-3000-9-py2
  driver:
  image: saltimages/salt-3000.9-py2:arch-base-latest
- run_command: /usr/lib/systemd/systemd
-
-provisioner:
- name: salt_solo
- log_level: debug
- salt_install: none
- require_chef: false
- formula: packages
- salt_copy_filter:
- - .kitchen
- - .git
 
 verifier:
  # https://www.inspec.io/