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

ci(kitchen+gitlab): adjust matrix to add `3003` [skip ci] 

* Automated using https://github.com/myii/ssf-formula/pull/318
tags/v1.2.1
Imran Iqbal 3 年之前
父節點
b8e0cb8b14
當前提交
79eb50a11a
沒有連結到貢獻者的電子郵件帳戶。
共有 2 個檔案被更改，包括 212 行新增 和 130 行删除
分割檢視 顯示文件統計
  1. +59
    -41
      .gitlab-ci.yml
  2. +153
    -89
      kitchen.yml

+ 59
- 41
.gitlab-ci.yml 查看文件

@@ -140,6 +140,7 @@ default-ubuntu-1804-master-py3: {extends: '.test_instance'}
default-ubuntu-1604-master-py3: {extends: '.test_instance'}
default-centos-8-master-py3: {extends: '.test_instance'}
default-centos-7-master-py3: {extends: '.test_instance'}
default-fedora-34-master-py3: {extends: '.test_instance'}
default-fedora-33-master-py3: {extends: '.test_instance'}
default-fedora-32-master-py3: {extends: '.test_instance'}
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
@@ -149,55 +150,72 @@ default-oraclelinux-8-master-py3: {extends: '.test_instance'}
default-oraclelinux-7-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
# default-debian-10-3002-5-py3: {extends: '.test_instance'}
# default-debian-9-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
# default-centos-8-3002-5-py3: {extends: '.test_instance'}
# default-centos-7-3002-5-py3: {extends: '.test_instance'}
# default-fedora-33-3002-5-py3: {extends: '.test_instance'}
# default-fedora-32-3002-5-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
# default-debian-10-3003-0-py3: {extends: '.test_instance'}
# default-debian-9-3003-0-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
# default-centos-8-3003-0-py3: {extends: '.test_instance'}
# default-centos-7-3003-0-py3: {extends: '.test_instance'}
# default-fedora-34-3003-0-py3: {extends: '.test_instance'}
# default-fedora-33-3003-0-py3: {extends: '.test_instance'}
# default-fedora-32-3003-0-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
default-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
# default-debian-10-3002-6-py3: {extends: '.test_instance'}
# default-debian-9-3002-6-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
# default-centos-8-3002-6-py3: {extends: '.test_instance'}
# default-centos-7-3002-6-py3: {extends: '.test_instance'}
# default-fedora-34-3002-6-py3: {extends: '.test_instance'}
# default-fedora-33-3002-6-py3: {extends: '.test_instance'}
# default-fedora-32-3002-6-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
# default-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
# default-debian-10-3001-6-py3: {extends: '.test_instance'}
# default-debian-9-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
# default-centos-8-3001-6-py3: {extends: '.test_instance'}
# default-centos-7-3001-6-py3: {extends: '.test_instance'}
# default-fedora-33-3001-6-py3: {extends: '.test_instance'}
# default-fedora-32-3001-6-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
# default-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
# default-debian-10-3001-7-py3: {extends: '.test_instance'}
# default-debian-9-3001-7-py3: {extends: '.test_instance'}
# default-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
# default-centos-8-3001-7-py3: {extends: '.test_instance'}
# default-centos-7-3001-7-py3: {extends: '.test_instance'}
# default-fedora-34-3001-7-py3: {extends: '.test_instance'}
# default-fedora-33-3001-7-py3: {extends: '.test_instance'}
# default-fedora-32-3001-7-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
# default-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
# default-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
# default-debian-10-3000-8-py3: {extends: '.test_instance'}
# default-debian-9-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
# default-centos-8-3000-8-py3: {extends: '.test_instance'}
# default-centos-7-3000-8-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
# default-debian-10-3000-9-py3: {extends: '.test_instance'}
# default-debian-9-3000-9-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
# default-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
# default-centos-8-3000-9-py3: {extends: '.test_instance'}
# default-centos-7-3000-9-py3: {extends: '.test_instance'}
# default-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
# default-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
# default-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
# default-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
# default-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
# default-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
# default-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
# default-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
# default-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
# default-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
# default-arch-base-latest-3000-8-py2: {extends: '.test_instance'}

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

+ 153
- 89
kitchen.yml 查看文件

@@ -63,6 +63,9 @@ platforms:
- name: centos-7-master-py3
driver:
image: saltimages/salt-master-py3:centos-7
- name: fedora-34-master-py3
driver:
image: saltimages/salt-master-py3:fedora-34
- name: fedora-33-master-py3
driver:
image: saltimages/salt-master-py3:fedora-33
@@ -102,47 +105,101 @@ platforms:
driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd

## SALT `3002.5`
- name: debian-10-3002-5-py3
## SALT `3003.0`
- name: debian-10-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:debian-10
- name: debian-9-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:debian-9
- name: ubuntu-2004-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:ubuntu-20.04
- name: ubuntu-1804-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:ubuntu-18.04
- name: centos-8-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:centos-8
- name: centos-7-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:centos-7
- name: fedora-34-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:fedora-34
- name: fedora-33-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:fedora-33
- name: fedora-32-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:fedora-32
- name: amazonlinux-2-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:amazonlinux-2
- name: oraclelinux-8-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:oraclelinux-8
- name: oraclelinux-7-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:oraclelinux-7
- name: arch-base-latest-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd
- name: gentoo-stage3-latest-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-latest
run_command: /sbin/init
- name: gentoo-stage3-systemd-3003-0-py3
driver:
image: saltimages/salt-3003.0-py3:gentoo-stage3-systemd

## SALT `3002.6`
- name: debian-10-3002-6-py3
driver:
image: saltimages/salt-3002.6-py3:debian-10
- name: debian-9-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:debian-10
- name: debian-9-3002-5-py3
image: saltimages/salt-3002.6-py3:debian-9
- name: ubuntu-2004-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:debian-9
- name: ubuntu-2004-3002-5-py3
image: saltimages/salt-3002.6-py3:ubuntu-20.04
- name: ubuntu-1804-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-20.04
- name: ubuntu-1804-3002-5-py3
image: saltimages/salt-3002.6-py3:ubuntu-18.04
- name: ubuntu-1604-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-18.04
- name: ubuntu-1604-3002-5-py3
image: saltimages/salt-3002.6-py3:ubuntu-16.04
- name: centos-8-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:ubuntu-16.04
- name: centos-8-3002-5-py3
image: saltimages/salt-3002.6-py3:centos-8
- name: centos-7-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:centos-8
- name: centos-7-3002-5-py3
image: saltimages/salt-3002.6-py3:centos-7
- name: fedora-34-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:centos-7
- name: fedora-33-3002-5-py3
image: saltimages/salt-3002.6-py3:fedora-34
- name: fedora-33-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-33
- name: fedora-32-3002-5-py3
image: saltimages/salt-3002.6-py3:fedora-33
- name: fedora-32-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:fedora-32
- name: amazonlinux-2-3002-5-py3
image: saltimages/salt-3002.6-py3:fedora-32
- name: amazonlinux-2-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:amazonlinux-2
- name: oraclelinux-8-3002-5-py3
image: saltimages/salt-3002.6-py3:amazonlinux-2
- name: oraclelinux-8-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-8
- name: oraclelinux-7-3002-5-py3
image: saltimages/salt-3002.6-py3:oraclelinux-8
- name: oraclelinux-7-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:oraclelinux-7
- name: arch-base-latest-3002-5-py3
image: saltimages/salt-3002.6-py3:oraclelinux-7
- name: arch-base-latest-3002-6-py3
driver:
image: saltimages/salt-3002.5-py3:arch-base-latest
image: saltimages/salt-3002.6-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3002.5`
- name: gentoo-stage3-latest-3002-5-py3
driver:
image: saltimages/salt-3002.5-py3:gentoo-stage3-latest
@@ -169,63 +226,68 @@ platforms:
transport:
max_ssh_sessions: 1

## SALT `3001.6`
- name: debian-10-3001-6-py3
## SALT `3001.7`
- name: debian-10-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:debian-10
- name: debian-9-3001-6-py3
image: saltimages/salt-3001.7-py3:debian-10
- name: debian-9-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:debian-9
- name: ubuntu-2004-3001-6-py3
image: saltimages/salt-3001.7-py3:debian-9
- name: ubuntu-2004-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-20.04
- name: ubuntu-1804-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-20.04
- name: ubuntu-1804-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-18.04
- name: ubuntu-1604-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-18.04
- name: ubuntu-1604-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:ubuntu-16.04
- name: centos-8-3001-6-py3
image: saltimages/salt-3001.7-py3:ubuntu-16.04
- name: centos-8-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:centos-8
- name: centos-7-3001-6-py3
image: saltimages/salt-3001.7-py3:centos-8
- name: centos-7-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:centos-7
- name: fedora-33-3001-6-py3
image: saltimages/salt-3001.7-py3:centos-7
- name: fedora-34-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:fedora-33
- name: fedora-32-3001-6-py3
image: saltimages/salt-3001.7-py3:fedora-34
- name: fedora-33-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:fedora-32
- name: opensuse-leap-152-3001-6-py3
image: saltimages/salt-3001.7-py3:fedora-33
- name: fedora-32-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:opensuse-leap-15.2
image: saltimages/salt-3001.7-py3:fedora-32
- 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-6-py3
- name: opensuse-tmbl-latest-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:opensuse-tumbleweed-latest
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:
max_ssh_sessions: 1
- name: amazonlinux-2-3001-6-py3
- name: amazonlinux-2-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:amazonlinux-2
- name: oraclelinux-8-3001-6-py3
image: saltimages/salt-3001.7-py3:amazonlinux-2
- name: oraclelinux-8-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:oraclelinux-8
- name: oraclelinux-7-3001-6-py3
image: saltimages/salt-3001.7-py3:oraclelinux-8
- name: oraclelinux-7-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:oraclelinux-7
- name: arch-base-latest-3001-6-py3
image: saltimages/salt-3001.7-py3:oraclelinux-7
- name: arch-base-latest-3001-7-py3
driver:
image: saltimages/salt-3001.6-py3:arch-base-latest
image: saltimages/salt-3001.7-py3:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3001.6`
- name: gentoo-stage3-latest-3001-6-py3
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-latest
@@ -234,42 +296,54 @@ platforms:
driver:
image: saltimages/salt-3001.6-py3:gentoo-stage3-systemd

## SALT `3000.8`
- name: debian-10-3000-8-py3
## SALT `3000.9`
- name: debian-10-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:debian-10
- name: debian-9-3000-8-py3
image: saltimages/salt-3000.9-py3:debian-10
- name: debian-9-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:debian-9
- name: ubuntu-1804-3000-8-py3
image: saltimages/salt-3000.9-py3:debian-9
- name: ubuntu-1804-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:ubuntu-18.04
- name: ubuntu-1604-3000-8-py3
image: saltimages/salt-3000.9-py3:ubuntu-18.04
- name: ubuntu-1604-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:ubuntu-16.04
- name: centos-8-3000-8-py3
image: saltimages/salt-3000.9-py3:ubuntu-16.04
- name: centos-8-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:centos-8
- name: centos-7-3000-8-py3
image: saltimages/salt-3000.9-py3:centos-8
- name: centos-7-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:centos-7
- name: opensuse-leap-152-3000-8-py3
image: saltimages/salt-3000.9-py3:centos-7
- name: opensuse-leap-152-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:opensuse-leap-15.2
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:
max_ssh_sessions: 1
- name: amazonlinux-2-3000-8-py3
- name: amazonlinux-2-3000-9-py3
driver:
image: saltimages/salt-3000.9-py3:amazonlinux-2
- name: oraclelinux-8-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:amazonlinux-2
- name: oraclelinux-8-3000-8-py3
image: saltimages/salt-3000.9-py3:oraclelinux-8
- name: oraclelinux-7-3000-9-py3
driver:
image: saltimages/salt-3000.8-py3:oraclelinux-8
- name: oraclelinux-7-3000-8-py3
image: saltimages/salt-3000.9-py3:oraclelinux-7
- name: ubuntu-1804-3000-9-py2
driver:
image: saltimages/salt-3000.8-py3:oraclelinux-7
image: saltimages/salt-3000.9-py2:ubuntu-18.04
- name: ubuntu-1604-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:ubuntu-16.04
- name: arch-base-latest-3000-9-py2
driver:
image: saltimages/salt-3000.9-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

## SALT `3000.8`
- name: gentoo-stage3-latest-3000-8-py3
driver:
image: saltimages/salt-3000.8-py3:gentoo-stage3-latest
@@ -277,16 +351,6 @@ platforms:
- name: gentoo-stage3-systemd-3000-8-py3
driver:
image: saltimages/salt-3000.8-py3:gentoo-stage3-systemd
- name: ubuntu-1804-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:ubuntu-18.04
- name: ubuntu-1604-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:ubuntu-16.04
- name: arch-base-latest-3000-8-py2
driver:
image: saltimages/salt-3000.8-py2:arch-base-latest
run_command: /usr/lib/systemd/systemd

provisioner:
name: salt_solo

Write Preview
Loading…
取消
儲存