瀏覽代碼

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

* Automated using https://github.com/myii/ssf-formula/pull/344
tags/v1.9.1
Imran Iqbal 3 年之前
父節點
當前提交
5cc8759efd
No account linked to committer's email address
共有 2 個文件被更改,包括 39 次插入34 次删除
  1. +4
    -4
      kitchen.windows.yml
  2. +35
    -30
      kitchen.yml

+ 4
- 4
kitchen.windows.yml 查看文件

@@ -9,10 +9,6 @@ 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 -version 3003.1
@@ -23,3 +19,7 @@ provisioner:
source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
skip_verify=True makedirs=True
# yamllint enable rule:line-length

platforms:
- name: windows-2019-latest-py3
- name: windows-2016-latest-py3

+ 35
- 30
kitchen.yml 查看文件

@@ -6,22 +6,36 @@ 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: salt
salt_copy_filter:
- .kitchen
- .git

platforms:
## SALT `tiamat`
- name: debian-10-tiamat-py3
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-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
@@ -48,15 +62,19 @@ platforms:
- name: debian-10-master-py3
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-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
@@ -72,7 +90,6 @@ 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:
@@ -80,7 +97,6 @@ platforms:
- 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:
@@ -88,7 +104,6 @@ platforms:
- 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:
@@ -105,7 +120,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
@@ -124,15 +138,19 @@ platforms:
- name: debian-10-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:debian-9
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
@@ -148,7 +166,6 @@ 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:
@@ -156,7 +173,6 @@ platforms:
- 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:
@@ -164,7 +180,6 @@ platforms:
- 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:
@@ -181,7 +196,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
@@ -194,15 +208,19 @@ platforms:
- name: debian-10-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-9
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
@@ -227,7 +245,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
@@ -240,7 +257,6 @@ 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:
@@ -248,7 +264,6 @@ platforms:
- 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:
@@ -256,7 +271,6 @@ platforms:
- 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:
@@ -266,15 +280,19 @@ platforms:
- name: debian-10-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:debian-9
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
@@ -290,7 +308,6 @@ 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:
@@ -298,7 +315,6 @@ platforms:
- 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:
@@ -306,7 +322,6 @@ platforms:
- 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:
@@ -323,7 +338,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
@@ -336,12 +350,15 @@ platforms:
- name: debian-10-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:debian-9
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
@@ -351,7 +368,6 @@ 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:
@@ -359,7 +375,6 @@ platforms:
- 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:
@@ -383,20 +398,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: salt
salt_copy_filter:
- .kitchen
- .git

verifier:
# https://www.inspec.io/

Loading…
取消
儲存