ExternalMirrors
/
old-salt-formula
镜像来自 https://github.com/saltstack-formulas/salt-formula
關注 1
收藏 0
複製 1
程式碼 問題 0 版本發佈 68 Wiki 活動
瀏覽代碼

ci(kitchen+ci): update with latest CVE pre-salted images 

* Semi-automated using https://github.com/myii/ssf-formula/pull/374
tags/v1.9.3
Imran Iqbal 3 年之前
父節點
f4a91c458c
當前提交
1a8512d77f
沒有連結到貢獻者的電子郵件帳戶。
共有 7 個檔案被更改，包括 240 行新增 和 455 行删除
分割檢視 顯示文件統計
  1. +0
    -1
      .github/workflows/kitchen.vagrant.yml
  2. +1
    -0
      .gitignore
  3. +40
    -71
      .gitlab-ci.yml
  4. +40
    -71
      .travis.yml
  5. +0
    -6
      kitchen.vagrant.yml
  6. +1
    -1
      kitchen.windows.yml
  7. +158
    -305
      kitchen.yml

+ 0
- 1
.github/workflows/kitchen.vagrant.yml 查看文件

@@ -16,7 +16,6 @@ jobs:
instance:
- v3003-py3-freebsd-130-3003-1-py3
- v3003-py3-freebsd-122-3003-1-py3
- v3003-py3-freebsd-114-3003-1-py3
- v3002-py3-openbsd-69-3002-6-py3
- v3001-py3-openbsd-68-3001-1-py3
- v3003-py3-windows-10-latest-py3

+ 1
- 0
.gitignore 查看文件

@@ -127,6 +127,7 @@ tmp/
# `salt-formula` -- Vagrant Specific files
.vagrant
top.sls
!test/salt/pillar/top.sls

# `suricata-formula` -- Platform binaries
*.rpm

+ 40
- 71
.gitlab-ci.yml 查看文件

@@ -130,77 +130,46 @@ rubocop:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
v3003-py3-debian-11-3003-2-py3: {extends: '.test_instance_failure_permitted'}
# v3003-py3-debian-10-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-2-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-centos-7-3003-2-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-2-py3: {extends: '.test_instance'}
v3003-py3-fedora-33-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-153-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-2-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-2-py3: {extends: '.test_instance'}
v3003-py3-oraclelinux-8-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-oraclelinux-7-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-arch-base-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-latest-3003-2-py3: {extends: '.test_instance'}
# v3003-py3-gentoo-stage3-systemd-3003-2-py3: {extends: '.test_instance'}
v3003-py3-almalinux-8-3003-2-py3: {extends: '.test_instance'}
v3003-py3-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
# v3002-py3-debian-11-3002-6-py3: {extends: '.test_instance'}
v3002-py3-debian-10-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-debian-9-3002-6-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-centos-8-3002-6-py3: {extends: '.test_instance'}
v3002-py3-centos-7-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-fedora-34-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-fedora-33-3002-6-py3: {extends: '.test_instance'}
v3002-py3-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
# v3002-py3-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
v3002-py3-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
v3002-py3-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
v3001-py3-debian-10-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-debian-9-3001-7-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
v3001-py3-centos-8-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-centos-7-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-fedora-34-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-fedora-33-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
# v3001-py3-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
# v3000-py3-debian-10-3000-9-py3: {extends: '.test_instance'}
v3000-py3-debian-9-3000-9-py3: {extends: '.test_instance'}
v3000-py3-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-centos-8-3000-9-py3: {extends: '.test_instance'}
v3000-py3-centos-7-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
v3000-py3-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
# v3000-py3-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
v3000-py2-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
# v3000-py2-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
v3003-py3-debian-11-3003-3-py3: {extends: '.test_instance_failure_permitted'}
# v3003-py3-debian-10-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-debian-9-3003-3-py3: {extends: '.test_instance'}
v3003-py3-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
v3003-py3-centos-8-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-centos-7-3003-3-py3: {extends: '.test_instance'}
v3003-py3-fedora-34-3003-3-py3: {extends: '.test_instance'}
v3003-py3-fedora-33-3003-3-py3: {extends: '.test_instance'}
v3003-py3-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
v3003-py3-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
# v3003-py3-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
v3003-py3-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
v3003-py3-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
v3003-py3-almalinux-8-3003-3-py3: {extends: '.test_instance'}
# v3002-py3-debian-11-3002-7-py3: {extends: '.test_instance_failure_permitted'}
v3002-py3-debian-10-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-debian-9-3002-7-py3: {extends: '.test_instance'}
v3002-py3-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
v3002-py3-centos-8-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-centos-7-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
v3002-py3-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
# v3002-py3-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
# v3001-py3-debian-10-3001-8-py3: {extends: '.test_instance'}
v3001-py3-debian-9-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
v3001-py3-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-centos-8-3001-8-py3: {extends: '.test_instance'}
v3001-py3-centos-7-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
# v3001-py3-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
v3001-py3-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}

###############################################################################
# `release` stage: `semantic-release`

+ 40
- 71
.travis.yml 查看文件

@@ -83,77 +83,46 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
- env: INSTANCE=v3003-py3-debian-11-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-2-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-2-py3
- env: INSTANCE=v3003-py3-ubuntu-2004-3003-2-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-2-py3
- env: INSTANCE=v3003-py3-centos-8-3003-2-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-2-py3
- env: INSTANCE=v3003-py3-fedora-34-3003-2-py3
- env: INSTANCE=v3003-py3-fedora-33-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-2-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-2-py3
- env: INSTANCE=v3003-py3-amazonlinux-2-3003-2-py3
- env: INSTANCE=v3003-py3-oraclelinux-8-3003-2-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-2-py3
# - env: INSTANCE=v3003-py3-arch-base-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-2-py3
# - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-2-py3
- env: INSTANCE=v3003-py3-almalinux-8-3003-2-py3
- env: INSTANCE=v3003-py3-arch-base-latest-3003-1-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-1-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-1-py3
# - env: INSTANCE=v3002-py3-debian-11-3002-6-py3
- env: INSTANCE=v3002-py3-debian-10-3002-6-py3
# - env: INSTANCE=v3002-py3-debian-9-3002-6-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-6-py3
# - env: INSTANCE=v3002-py3-ubuntu-1804-3002-6-py3
# - env: INSTANCE=v3002-py3-centos-8-3002-6-py3
- env: INSTANCE=v3002-py3-centos-7-3002-6-py3
# - env: INSTANCE=v3002-py3-fedora-34-3002-6-py3
# - env: INSTANCE=v3002-py3-fedora-33-3002-6-py3
- env: INSTANCE=v3002-py3-amazonlinux-2-3002-6-py3
# - env: INSTANCE=v3002-py3-oraclelinux-8-3002-6-py3
- env: INSTANCE=v3002-py3-oraclelinux-7-3002-6-py3
# - env: INSTANCE=v3002-py3-arch-base-latest-3002-6-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-6-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-6-py3
# - env: INSTANCE=v3002-py3-opensuse-leap-153-3002-2-py3
- env: INSTANCE=v3002-py3-opensuse-leap-152-3002-2-py3
- env: INSTANCE=v3002-py3-opensuse-tmbl-latest-3002-2-py3
- env: INSTANCE=v3001-py3-debian-10-3001-7-py3
# - env: INSTANCE=v3001-py3-debian-9-3001-7-py3
- env: INSTANCE=v3001-py3-ubuntu-2004-3001-7-py3
# - env: INSTANCE=v3001-py3-ubuntu-1804-3001-7-py3
- env: INSTANCE=v3001-py3-centos-8-3001-7-py3
# - env: INSTANCE=v3001-py3-centos-7-3001-7-py3
# - env: INSTANCE=v3001-py3-fedora-34-3001-7-py3
# - env: INSTANCE=v3001-py3-fedora-33-3001-7-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-153-3001-7-py3
# - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-7-py3
# - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-7-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-7-py3
- env: INSTANCE=v3001-py3-oraclelinux-8-3001-7-py3
# - env: INSTANCE=v3001-py3-oraclelinux-7-3001-7-py3
# - env: INSTANCE=v3001-py3-arch-base-latest-3001-7-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-7-py3
# - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-7-py3
# - env: INSTANCE=v3000-py3-debian-10-3000-9-py3
- env: INSTANCE=v3000-py3-debian-9-3000-9-py3
- env: INSTANCE=v3000-py3-ubuntu-1804-3000-9-py3
# - env: INSTANCE=v3000-py3-centos-8-3000-9-py3
- env: INSTANCE=v3000-py3-centos-7-3000-9-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-153-3000-9-py3
# - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-9-py3
# - env: INSTANCE=v3000-py3-amazonlinux-2-3000-9-py3
# - env: INSTANCE=v3000-py3-oraclelinux-8-3000-9-py3
- env: INSTANCE=v3000-py3-oraclelinux-7-3000-9-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-9-py3
# - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-9-py3
- env: INSTANCE=v3000-py2-ubuntu-1804-3000-9-py2
# - env: INSTANCE=v3000-py2-arch-base-latest-3000-9-py2
- env: INSTANCE=v3003-py3-debian-11-3003-3-py3
# - env: INSTANCE=v3003-py3-debian-10-3003-3-py3
# - env: INSTANCE=v3003-py3-debian-9-3003-3-py3
- env: INSTANCE=v3003-py3-ubuntu-2004-3003-3-py3
# - env: INSTANCE=v3003-py3-ubuntu-1804-3003-3-py3
- env: INSTANCE=v3003-py3-centos-8-3003-3-py3
# - env: INSTANCE=v3003-py3-centos-7-3003-3-py3
- env: INSTANCE=v3003-py3-fedora-34-3003-3-py3
- env: INSTANCE=v3003-py3-fedora-33-3003-3-py3
- env: INSTANCE=v3003-py3-opensuse-leap-153-3003-3-py3
# - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-3-py3
# - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-3-py3
- env: INSTANCE=v3003-py3-amazonlinux-2-3003-3-py3
- env: INSTANCE=v3003-py3-oraclelinux-8-3003-3-py3
# - env: INSTANCE=v3003-py3-oraclelinux-7-3003-3-py3
- env: INSTANCE=v3003-py3-arch-base-latest-3003-3-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-3-py3
- env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-3-py3
- env: INSTANCE=v3003-py3-almalinux-8-3003-3-py3
# - env: INSTANCE=v3002-py3-debian-11-3002-7-py3
- env: INSTANCE=v3002-py3-debian-10-3002-7-py3
# - env: INSTANCE=v3002-py3-debian-9-3002-7-py3
- env: INSTANCE=v3002-py3-ubuntu-2004-3002-7-py3
# - env: INSTANCE=v3002-py3-ubuntu-1804-3002-7-py3
- env: INSTANCE=v3002-py3-centos-8-3002-7-py3
# - env: INSTANCE=v3002-py3-centos-7-3002-7-py3
# - env: INSTANCE=v3002-py3-amazonlinux-2-3002-7-py3
- env: INSTANCE=v3002-py3-oraclelinux-8-3002-7-py3
# - env: INSTANCE=v3002-py3-oraclelinux-7-3002-7-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-7-py3
# - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-7-py3
# - env: INSTANCE=v3001-py3-debian-10-3001-8-py3
- env: INSTANCE=v3001-py3-debian-9-3001-8-py3
# - env: INSTANCE=v3001-py3-ubuntu-2004-3001-8-py3
- env: INSTANCE=v3001-py3-ubuntu-1804-3001-8-py3
# - env: INSTANCE=v3001-py3-centos-8-3001-8-py3
- env: INSTANCE=v3001-py3-centos-7-3001-8-py3
# - env: INSTANCE=v3001-py3-amazonlinux-2-3001-8-py3
# - env: INSTANCE=v3001-py3-oraclelinux-8-3001-8-py3
- env: INSTANCE=v3001-py3-oraclelinux-7-3001-8-py3

## Define the release stage that runs `semantic-release`
- stage: 'release'

+ 0
- 6
kitchen.vagrant.yml 查看文件

@@ -25,9 +25,6 @@ platforms:
- name: freebsd-122-master-py3
driver:
box: myii/freebsd-12.2-master-py3
- name: freebsd-114-master-py3
driver:
box: myii/freebsd-11.4-master-py3
- name: freebsd-130-3003-1-py3
driver:
box: myii/freebsd-13.0-3003.1-py3
@@ -35,9 +32,6 @@ platforms:
- name: freebsd-122-3003-1-py3
driver:
box: myii/freebsd-12.2-3003.1-py3
- name: freebsd-114-3003-1-py3
driver:
box: myii/freebsd-11.4-3003.1-py3
- name: openbsd-69-3002-6-py3
driver:
box: myii/openbsd-6.9-3002.6-py3

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

@@ -11,7 +11,7 @@ driver:

provisioner:
salt_install: bootstrap
salt_bootstrap_options: -pythonVersion 3 -version 3003.2
salt_bootstrap_options: -pythonVersion 3 -version 3003.3
# yamllint disable rule:line-length
init_environment: |
C:\salt\salt-call --local state.single file.managed `

+ 158
- 305
kitchen.yml 查看文件

@@ -142,297 +142,226 @@ platforms:
driver:
image: saltimages/salt-master-py3:rockylinux-8

## SALT `3003.2`
- name: debian-11-3003-2-py3
## SALT `3003.3`
- name: debian-11-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:debian-11
image: saltimages/salt-3003.3-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3003-2-py3
- name: debian-10-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:debian-10
image: saltimages/salt-3003.3-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3003-2-py3
- name: debian-9-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:debian-9
image: saltimages/salt-3003.3-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3003-2-py3
- name: ubuntu-2004-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:ubuntu-20.04
image: saltimages/salt-3003.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3003-2-py3
- name: ubuntu-1804-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:ubuntu-18.04
image: saltimages/salt-3003.3-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-8-3003-2-py3
- name: centos-8-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:centos-8
- name: centos-7-3003-2-py3
image: saltimages/salt-3003.3-py3:centos-8
- name: centos-7-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:centos-7
- name: fedora-34-3003-2-py3
image: saltimages/salt-3003.3-py3:centos-7
- name: fedora-34-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:fedora-34
- name: fedora-33-3003-2-py3
image: saltimages/salt-3003.3-py3:fedora-34
- name: fedora-33-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:fedora-33
- name: opensuse-leap-153-3003-2-py3
image: saltimages/salt-3003.3-py3:fedora-33
- name: opensuse-leap-153-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:opensuse-leap-15.3
image: saltimages/salt-3003.3-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-leap-152-3003-2-py3
- name: opensuse-leap-152-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:opensuse-leap-15.2
image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
# 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-2-py3
- name: opensuse-tmbl-latest-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3003.3-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-3003-2-py3
- name: amazonlinux-2-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:amazonlinux-2
- name: oraclelinux-8-3003-2-py3
image: saltimages/salt-3003.3-py3:amazonlinux-2
- name: oraclelinux-8-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:oraclelinux-8
- name: oraclelinux-7-3003-2-py3
image: saltimages/salt-3003.3-py3:oraclelinux-8
- name: oraclelinux-7-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:oraclelinux-7
- name: arch-base-latest-3003-2-py3
image: saltimages/salt-3003.3-py3:oraclelinux-7
- name: arch-base-latest-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-2-py3
image: saltimages/salt-3003.3-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-latest
image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-2-py3
- name: gentoo-stage3-systemd-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:gentoo-stage3-systemd
- name: almalinux-8-3003-2-py3
image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
- name: almalinux-8-3003-3-py3
driver:
image: saltimages/salt-3003.2-py3:almalinux-8
image: saltimages/salt-3003.3-py3:almalinux-8

## SALT `3003.1`
- name: arch-base-latest-3003-1-py3
## SALT `3002.7`
- name: debian-11-3002-7-py3
driver:
image: saltimages/salt-3003.1-py3:arch-base-latest
- name: gentoo-stage3-latest-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-1-py3
driver:
image: saltimages/salt-3003.1-py3:gentoo-stage3-systemd

## SALT `3002.6`
- name: debian-11-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-11
image: saltimages/salt-3002.7-py3:debian-11
run_command: /lib/systemd/systemd
- name: debian-10-3002-6-py3
- name: debian-10-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
image: saltimages/salt-3002.7-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3002-6-py3
- name: debian-9-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:debian-9
image: saltimages/salt-3002.7-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3002-6-py3
- name: ubuntu-2004-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-20.04
image: saltimages/salt-3002.7-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3002-6-py3
- name: ubuntu-1804-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:ubuntu-18.04
image: saltimages/salt-3002.7-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-8-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:centos-8
- name: centos-7-3002-6-py3
- name: centos-8-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:centos-7
- name: fedora-34-3002-6-py3
image: saltimages/salt-3002.7-py3:centos-8
- name: centos-7-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:fedora-34
- name: fedora-33-3002-6-py3
image: saltimages/salt-3002.7-py3:centos-7
- name: fedora-34-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:fedora-33
- name: amazonlinux-2-3002-6-py3
image: saltimages/salt-3002.7-py3:fedora-34
- name: fedora-33-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:amazonlinux-2
- name: oraclelinux-8-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:oraclelinux-8
- name: oraclelinux-7-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:oraclelinux-7
- name: arch-base-latest-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:arch-base-latest
- name: gentoo-stage3-latest-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3002-6-py3
image: saltimages/salt-3002.7-py3:fedora-33
- name: opensuse-leap-153-3002-7-py3
driver:
image: saltimages/salt-3002.6-py3:gentoo-stage3-systemd

## SALT `3002.2`
- name: opensuse-leap-153-3002-2-py3
driver:
image: saltimages/salt-3002.2-py3:opensuse-leap-15.3
image: saltimages/salt-3002.7-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-leap-152-3002-2-py3
- name: opensuse-leap-152-3002-7-py3
driver:
image: saltimages/salt-3002.2-py3:opensuse-leap-15.2
image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
# 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
- name: opensuse-tmbl-latest-3002-7-py3
driver:
image: saltimages/salt-3002.2-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3002.7-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-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:amazonlinux-2
- name: oraclelinux-8-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-8
- name: oraclelinux-7-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:oraclelinux-7
- name: arch-base-latest-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:arch-base-latest
- name: gentoo-stage3-latest-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3002-7-py3
driver:
image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd

## SALT `3001.7`
- name: debian-10-3001-7-py3
## SALT `3001.8`
- name: debian-10-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:debian-10
image: saltimages/salt-3001.8-py3:debian-10
run_command: /lib/systemd/systemd
- name: debian-9-3001-7-py3
- name: debian-9-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:debian-9
image: saltimages/salt-3001.8-py3:debian-9
run_command: /lib/systemd/systemd
- name: ubuntu-2004-3001-7-py3
- name: ubuntu-2004-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:ubuntu-20.04
image: saltimages/salt-3001.8-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: ubuntu-1804-3001-7-py3
- name: ubuntu-1804-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:ubuntu-18.04
image: saltimages/salt-3001.8-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
- name: centos-8-3001-7-py3
- name: centos-8-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:centos-8
- name: centos-7-3001-7-py3
image: saltimages/salt-3001.8-py3:centos-8
- name: centos-7-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:centos-7
- name: fedora-34-3001-7-py3
image: saltimages/salt-3001.8-py3:centos-7
- name: fedora-34-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:fedora-34
- name: fedora-33-3001-7-py3
image: saltimages/salt-3001.8-py3:fedora-34
- name: fedora-33-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:fedora-33
- name: opensuse-leap-153-3001-7-py3
image: saltimages/salt-3001.8-py3:fedora-33
- name: opensuse-leap-153-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:opensuse-leap-15.3
image: saltimages/salt-3001.8-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-leap-152-3001-7-py3
- name: opensuse-leap-152-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:opensuse-leap-15.2
image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
# 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
- name: opensuse-tmbl-latest-3001-8-py3
driver:
image: saltimages/salt-3001.7-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3001.8-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-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:amazonlinux-2
- name: oraclelinux-8-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:oraclelinux-8
- name: oraclelinux-7-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:oraclelinux-7
- name: arch-base-latest-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:arch-base-latest
- name: gentoo-stage3-latest-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3001-7-py3
driver:
image: saltimages/salt-3001.7-py3:gentoo-stage3-systemd

## SALT `3000.9`
- 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
- name: centos-7-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:centos-7
- name: opensuse-leap-153-3000-9-py3
driver:
image: saltimages/salt-3000.9-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-leap-152-3000-9-py3
- name: amazonlinux-2-3001-8-py3
driver:
image: saltimages/salt-3000.9-py3:opensuse-leap-15.2
# 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: amazonlinux-2-3000-9-py3
image: saltimages/salt-3001.8-py3:amazonlinux-2
- name: oraclelinux-8-3001-8-py3
driver:
image: saltimages/salt-3000.9-py3:amazonlinux-2
- name: oraclelinux-8-3000-9-py3
image: saltimages/salt-3001.8-py3:oraclelinux-8
- name: oraclelinux-7-3001-8-py3
driver:
image: saltimages/salt-3000.9-py3:oraclelinux-8
- name: oraclelinux-7-3000-9-py3
image: saltimages/salt-3001.8-py3:oraclelinux-7
- name: arch-base-latest-3001-8-py3
driver:
image: saltimages/salt-3000.9-py3:oraclelinux-7
- name: gentoo-stage3-latest-3000-9-py3
image: saltimages/salt-3001.8-py3:arch-base-latest
- name: gentoo-stage3-latest-3001-8-py3
driver:
image: saltimages/salt-3000.9-py3:gentoo-stage3-latest
image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:gentoo-stage3-systemd
- 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
- name: gentoo-stage3-systemd-3001-8-py3
driver:
image: saltimages/salt-3000.9-py2:arch-base-latest
image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd

verifier:
# https://www.inspec.io/
@@ -445,31 +374,27 @@ verifier:
suites:
- name: v3003-py3
includes:
- debian-11-3003-2-py3
- debian-10-3003-2-py3
- debian-9-3003-2-py3
- ubuntu-2004-3003-2-py3
- ubuntu-1804-3003-2-py3
- centos-8-3003-2-py3
- centos-7-3003-2-py3
- fedora-34-3003-2-py3
- fedora-33-3003-2-py3
- opensuse-leap-153-3003-2-py3
- opensuse-leap-152-3003-2-py3
- opensuse-tmbl-latest-3003-2-py3
- amazonlinux-2-3003-2-py3
- oraclelinux-8-3003-2-py3
- oraclelinux-7-3003-2-py3
- arch-base-latest-3003-2-py3
- gentoo-stage3-latest-3003-2-py3
- gentoo-stage3-systemd-3003-2-py3
- almalinux-8-3003-2-py3
- arch-base-latest-3003-1-py3
- gentoo-stage3-latest-3003-1-py3
- gentoo-stage3-systemd-3003-1-py3
- debian-11-3003-3-py3
- debian-10-3003-3-py3
- debian-9-3003-3-py3
- ubuntu-2004-3003-3-py3
- ubuntu-1804-3003-3-py3
- centos-8-3003-3-py3
- centos-7-3003-3-py3
- fedora-34-3003-3-py3
- fedora-33-3003-3-py3
- opensuse-leap-153-3003-3-py3
- opensuse-leap-152-3003-3-py3
- opensuse-tmbl-latest-3003-3-py3
- amazonlinux-2-3003-3-py3
- oraclelinux-8-3003-3-py3
- oraclelinux-7-3003-3-py3
- arch-base-latest-3003-3-py3
- gentoo-stage3-latest-3003-3-py3
- gentoo-stage3-systemd-3003-3-py3
- almalinux-8-3003-3-py3
- freebsd-130-3003-1-py3
- freebsd-122-3003-1-py3
- freebsd-114-3003-1-py3
- windows-10-latest-py3
- windows-81-latest-py3
- windows-2019-latest-py3
@@ -496,24 +421,18 @@ suites:
- path: test/integration/v3003-py3
- name: v3002-py3
includes:
- debian-11-3002-6-py3
- debian-10-3002-6-py3
- debian-9-3002-6-py3
- ubuntu-2004-3002-6-py3
- ubuntu-1804-3002-6-py3
- centos-8-3002-6-py3
- centos-7-3002-6-py3
- fedora-34-3002-6-py3
- fedora-33-3002-6-py3
- amazonlinux-2-3002-6-py3
- oraclelinux-8-3002-6-py3
- oraclelinux-7-3002-6-py3
- arch-base-latest-3002-6-py3
- gentoo-stage3-latest-3002-6-py3
- gentoo-stage3-systemd-3002-6-py3
- opensuse-leap-153-3002-2-py3
- opensuse-leap-152-3002-2-py3
- opensuse-tmbl-latest-3002-2-py3
- debian-11-3002-7-py3
- debian-10-3002-7-py3
- debian-9-3002-7-py3
- ubuntu-2004-3002-7-py3
- ubuntu-1804-3002-7-py3
- centos-8-3002-7-py3
- centos-7-3002-7-py3
- amazonlinux-2-3002-7-py3
- oraclelinux-8-3002-7-py3
- oraclelinux-7-3002-7-py3
- gentoo-stage3-latest-3002-7-py3
- gentoo-stage3-systemd-3002-7-py3
- openbsd-69-3002-6-py3
provisioner:
state_top:
@@ -537,23 +456,15 @@ suites:
- path: test/integration/v3002-py3
- name: v3001-py3
includes:
- debian-10-3001-7-py3
- debian-9-3001-7-py3
- ubuntu-2004-3001-7-py3
- ubuntu-1804-3001-7-py3
- centos-8-3001-7-py3
- centos-7-3001-7-py3
- fedora-34-3001-7-py3
- fedora-33-3001-7-py3
- opensuse-leap-153-3001-7-py3
- opensuse-leap-152-3001-7-py3
- opensuse-tmbl-latest-3001-7-py3
- amazonlinux-2-3001-7-py3
- oraclelinux-8-3001-7-py3
- oraclelinux-7-3001-7-py3
- arch-base-latest-3001-7-py3
- gentoo-stage3-latest-3001-7-py3
- gentoo-stage3-systemd-3001-7-py3
- debian-10-3001-8-py3
- debian-9-3001-8-py3
- ubuntu-2004-3001-8-py3
- ubuntu-1804-3001-8-py3
- centos-8-3001-8-py3
- centos-7-3001-8-py3
- amazonlinux-2-3001-8-py3
- oraclelinux-8-3001-8-py3
- oraclelinux-7-3001-8-py3
- openbsd-68-3001-1-py3
provisioner:
state_top:
@@ -575,61 +486,3 @@ suites:
verifier:
inspec_tests:
- path: test/integration/v3001-py3
- name: v3000-py3
includes:
- debian-10-3000-9-py3
- debian-9-3000-9-py3
- ubuntu-1804-3000-9-py3
- centos-8-3000-9-py3
- centos-7-3000-9-py3
- opensuse-leap-153-3000-9-py3
- opensuse-leap-152-3000-9-py3
- amazonlinux-2-3000-9-py3
- oraclelinux-8-3000-9-py3
- oraclelinux-7-3000-9-py3
- gentoo-stage3-latest-3000-9-py3
- gentoo-stage3-systemd-3000-9-py3
provisioner:
state_top:
base:
'*':
- salt._mapdata
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3000-py3
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3000-py3.sls: test/salt/pillar/v3000-py3.sls
verifier:
inspec_tests:
- path: test/integration/v3000-py3
- name: v3000-py2
includes:
- ubuntu-1804-3000-9-py2
- arch-base-latest-3000-9-py2
provisioner:
state_top:
base:
'*':
- salt._mapdata
- salt.pkgrepo
- salt.master
- salt.minion
pillars:
top.sls:
base:
'*':
- salt
- v3000-py2
pillars_from_files:
salt.sls: test/salt/pillar/salt.sls
v3000-py2.sls: test/salt/pillar/v3000-py2.sls
verifier:
inspec_tests:
- path: test/integration/v3000-py2

Write Preview
Loading…
取消
儲存