Skip to content

Commit

Permalink
Merge pull request #515 from myii/ci/add-CVE-3003.3-3002.7-3001.8
Browse files Browse the repository at this point in the history 
ci(kitchen+gitlab): adjust matrix to use 3003.3, 3002.7 & 3001.8
  • Loading branch information
@myii
myii authored Oct 5, 2021
2 parents 72f7f48 + 1a8512d commit 9f22f28
Show file tree
Hide file tree
Showing 33 changed files with 243 additions and 2,310 deletions.
1 change: 0 additions & 1 deletion .github/workflows/kitchen.vagrant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ tmp/
# `salt-formula` -- Vagrant Specific files
.vagrant
top.sls
!test/salt/pillar/top.sls

# `suricata-formula` -- Platform binaries
*.rpm
Expand Down
111 changes: 40 additions & 71 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
111 changes: 40 additions & 71 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 0 additions & 6 deletions kitchen.vagrant.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,13 @@ 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
synced_folders: [] # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
- 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
Expand Down
2 changes: 1 addition & 1 deletion kitchen.windows.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 `
Expand Down
Loading

0 comments on commit 9f22f28

Please sign in to comment.