From 36a57fd5daba4593fa97a4bd88cfe845bc5769c9 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 23 Nov 2021 10:37:07 +0000 Subject: [PATCH] ci(kitchen+ci): update with `3004` pre-salted images/boxes [skip ci] * Automated using https://github.com/myii/ssf-formula/pull/385 --- .gitlab-ci.yml | 38 ++++++++++++++--- .travis.yml | 21 +++++++++ CODEOWNERS | 1 + kitchen.yml | 113 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7454af3..7a1bc96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -102,7 +102,7 @@ rubocop: ############################################################################### # Define `test` template ############################################################################### -.test_instance: +.test_instance: &test_instance stage: *stage_test image: *image_dindruby services: *services_docker_dind @@ -117,6 +117,13 @@ rubocop: # Alternative value to consider: `${CI_JOB_NAME}` - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"' +############################################################################### +# Define `test` template (`allow_failure: true`) +############################################################################### +.test_instance_failure_permitted: + <<: *test_instance + allow_failure: true + ############################################################################### # `test` stage: each instance below uses the `test` template above ############################################################################### @@ -128,6 +135,7 @@ rubocop: # debian-debian-9-tiamat-py3: {extends: '.test_instance'} # debian-ubuntu-2004-tiamat-py3: {extends: '.test_instance'} # debian-ubuntu-1804-tiamat-py3: {extends: '.test_instance'} +# redhat-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'} # redhat-centos-8-tiamat-py3: {extends: '.test_instance'} # redhat-centos-7-tiamat-py3: {extends: '.test_instance'} # redhat-amazonlinux-2-tiamat-py3: {extends: '.test_instance'} @@ -140,30 +148,50 @@ debian-debian-10-master-py3: {extends: '.test_instance'} debian-debian-9-master-py3: {extends: '.test_instance'} debian-ubuntu-2004-master-py3: {extends: '.test_instance'} debian-ubuntu-1804-master-py3: {extends: '.test_instance'} +redhat-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'} redhat-centos-8-master-py3: {extends: '.test_instance'} redhat-centos-7-master-py3: {extends: '.test_instance'} redhat-fedora-34-master-py3: {extends: '.test_instance'} redhat-fedora-33-master-py3: {extends: '.test_instance'} suse-opensuse-leap-153-master-py3: {extends: '.test_instance'} suse-opensuse-leap-152-master-py3: {extends: '.test_instance'} -suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'} +suse-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} redhat-amazonlinux-2-master-py3: {extends: '.test_instance'} redhat-oraclelinux-8-master-py3: {extends: '.test_instance'} redhat-oraclelinux-7-master-py3: {extends: '.test_instance'} redhat-almalinux-8-master-py3: {extends: '.test_instance'} redhat-rockylinux-8-master-py3: {extends: '.test_instance'} +# debian-debian-11-3004-0-py3: {extends: '.test_instance'} +# debian-debian-10-3004-0-py3: {extends: '.test_instance'} +# debian-debian-9-3004-0-py3: {extends: '.test_instance'} +# debian-ubuntu-2004-3004-0-py3: {extends: '.test_instance'} +# debian-ubuntu-1804-3004-0-py3: {extends: '.test_instance'} +# redhat-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'} +# redhat-centos-8-3004-0-py3: {extends: '.test_instance'} +# redhat-centos-7-3004-0-py3: {extends: '.test_instance'} +# redhat-fedora-34-3004-0-py3: {extends: '.test_instance'} +# redhat-fedora-33-3004-0-py3: {extends: '.test_instance'} +# suse-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'} +# suse-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'} +# redhat-amazonlinux-2-3004-0-py3: {extends: '.test_instance'} +# redhat-oraclelinux-8-3004-0-py3: {extends: '.test_instance'} +# redhat-oraclelinux-7-3004-0-py3: {extends: '.test_instance'} +# redhat-almalinux-8-3004-0-py3: {extends: '.test_instance'} +# redhat-rockylinux-8-3004-0-py3: {extends: '.test_instance'} # debian-debian-11-3003-3-py3: {extends: '.test_instance'} # debian-debian-10-3003-3-py3: {extends: '.test_instance'} # debian-debian-9-3003-3-py3: {extends: '.test_instance'} # debian-ubuntu-2004-3003-3-py3: {extends: '.test_instance'} # debian-ubuntu-1804-3003-3-py3: {extends: '.test_instance'} +# redhat-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'} # redhat-centos-8-3003-3-py3: {extends: '.test_instance'} # redhat-centos-7-3003-3-py3: {extends: '.test_instance'} # redhat-fedora-34-3003-3-py3: {extends: '.test_instance'} # redhat-fedora-33-3003-3-py3: {extends: '.test_instance'} # suse-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'} -# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'} # redhat-amazonlinux-2-3003-3-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3003-3-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3003-3-py3: {extends: '.test_instance'} @@ -179,7 +207,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'} # redhat-fedora-33-3002-7-py3: {extends: '.test_instance'} # suse-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'} -# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'} # redhat-amazonlinux-2-3002-7-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3002-7-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3002-7-py3: {extends: '.test_instance'} @@ -193,7 +221,7 @@ redhat-rockylinux-8-master-py3: {extends: '.test_instance'} # redhat-fedora-33-3001-8-py3: {extends: '.test_instance'} # suse-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'} # suse-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'} -# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance'} +# suse-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'} # redhat-amazonlinux-2-3001-8-py3: {extends: '.test_instance'} # redhat-oraclelinux-8-3001-8-py3: {extends: '.test_instance'} # redhat-oraclelinux-7-3001-8-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index f48267a..dd552ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,7 @@ jobs: # - env: INSTANCE=debian-debian-9-tiamat-py3 # - env: INSTANCE=debian-ubuntu-2004-tiamat-py3 # - env: INSTANCE=debian-ubuntu-1804-tiamat-py3 + # - env: INSTANCE=redhat-centos-stream8-tiamat-py3 # - env: INSTANCE=redhat-centos-8-tiamat-py3 # - env: INSTANCE=redhat-centos-7-tiamat-py3 # - env: INSTANCE=redhat-amazonlinux-2-tiamat-py3 @@ -111,6 +112,7 @@ jobs: - env: INSTANCE=debian-debian-9-master-py3 - env: INSTANCE=debian-ubuntu-2004-master-py3 - env: INSTANCE=debian-ubuntu-1804-master-py3 + - env: INSTANCE=redhat-centos-stream8-master-py3 - env: INSTANCE=redhat-centos-8-master-py3 - env: INSTANCE=redhat-centos-7-master-py3 - env: INSTANCE=redhat-fedora-34-master-py3 @@ -123,11 +125,30 @@ jobs: - env: INSTANCE=redhat-oraclelinux-7-master-py3 - env: INSTANCE=redhat-almalinux-8-master-py3 - env: INSTANCE=redhat-rockylinux-8-master-py3 + # - env: INSTANCE=debian-debian-11-3004-0-py3 + # - env: INSTANCE=debian-debian-10-3004-0-py3 + # - env: INSTANCE=debian-debian-9-3004-0-py3 + # - env: INSTANCE=debian-ubuntu-2004-3004-0-py3 + # - env: INSTANCE=debian-ubuntu-1804-3004-0-py3 + # - env: INSTANCE=redhat-centos-stream8-3004-0-py3 + # - env: INSTANCE=redhat-centos-8-3004-0-py3 + # - env: INSTANCE=redhat-centos-7-3004-0-py3 + # - env: INSTANCE=redhat-fedora-34-3004-0-py3 + # - env: INSTANCE=redhat-fedora-33-3004-0-py3 + # - env: INSTANCE=suse-opensuse-leap-153-3004-0-py3 + # - env: INSTANCE=suse-opensuse-leap-152-3004-0-py3 + # - env: INSTANCE=suse-opensuse-tmbl-latest-3004-0-py3 + # - env: INSTANCE=redhat-amazonlinux-2-3004-0-py3 + # - env: INSTANCE=redhat-oraclelinux-8-3004-0-py3 + # - env: INSTANCE=redhat-oraclelinux-7-3004-0-py3 + # - env: INSTANCE=redhat-almalinux-8-3004-0-py3 + # - env: INSTANCE=redhat-rockylinux-8-3004-0-py3 # - env: INSTANCE=debian-debian-11-3003-3-py3 # - env: INSTANCE=debian-debian-10-3003-3-py3 # - env: INSTANCE=debian-debian-9-3003-3-py3 # - env: INSTANCE=debian-ubuntu-2004-3003-3-py3 # - env: INSTANCE=debian-ubuntu-1804-3003-3-py3 + # - env: INSTANCE=redhat-centos-stream8-3003-3-py3 # - env: INSTANCE=redhat-centos-8-3003-3-py3 # - env: INSTANCE=redhat-centos-7-3003-3-py3 # - env: INSTANCE=redhat-fedora-34-3003-3-py3 diff --git a/CODEOWNERS b/CODEOWNERS index 4ed2eb9..fd11123 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -26,6 +26,7 @@ /test/integration/**/libraries/system.rb @saltstack-formulas/ssf /test/integration/**/inspec.yml @saltstack-formulas/ssf /test/integration/**/README.md @saltstack-formulas/ssf +/test/salt/pillar/top.sls @saltstack-formulas/ssf /.gitignore @saltstack-formulas/ssf /.cirrus.yml @saltstack-formulas/ssf /.gitlab-ci.yml @saltstack-formulas/ssf diff --git a/kitchen.yml b/kitchen.yml index 45298ad..a44f1d8 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -40,6 +40,9 @@ platforms: driver: image: saltimages/salt-tiamat-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-tiamat-py3 + driver: + image: saltimages/salt-tiamat-py3:centos-stream8 - name: centos-8-tiamat-py3 driver: image: saltimages/salt-tiamat-py3:centos-8 @@ -83,6 +86,9 @@ platforms: driver: image: saltimages/salt-master-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-master-py3 + driver: + image: saltimages/salt-master-py3:centos-stream8 - name: centos-8-master-py3 driver: image: saltimages/salt-master-py3:centos-8 @@ -142,6 +148,89 @@ platforms: driver: image: saltimages/salt-master-py3:rockylinux-8 + ## SALT `3004.0` + - name: debian-11-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-11 + run_command: /lib/systemd/systemd + - name: debian-10-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-10 + run_command: /lib/systemd/systemd + - name: debian-9-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:debian-9 + run_command: /lib/systemd/systemd + - name: ubuntu-2004-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-20.04 + run_command: /lib/systemd/systemd + - name: ubuntu-1804-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:ubuntu-18.04 + run_command: /lib/systemd/systemd + - name: centos-stream8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-stream8 + - name: centos-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-8 + - name: centos-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:centos-7 + - name: fedora-34-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-34 + - name: fedora-33-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:fedora-33 + - name: opensuse-leap-153-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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-3004-0-py3 + driver: + image: saltimages/salt-3004.0-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-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:amazonlinux-2 + - name: oraclelinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-8 + - name: oraclelinux-7-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:oraclelinux-7 + - name: arch-base-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:arch-base-latest + - name: gentoo-stage3-latest-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-latest + run_command: /sbin/init + - name: gentoo-stage3-systemd-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd + - name: almalinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:almalinux-8 + - name: rockylinux-8-3004-0-py3 + driver: + image: saltimages/salt-3004.0-py3:rockylinux-8 + ## SALT `3003.3` - name: debian-11-3003-3-py3 driver: @@ -163,6 +252,9 @@ platforms: driver: image: saltimages/salt-3003.3-py3:ubuntu-18.04 run_command: /lib/systemd/systemd + - name: centos-stream8-3003-3-py3 + driver: + image: saltimages/salt-3003.3-py3:centos-stream8 - name: centos-8-3003-3-py3 driver: image: saltimages/salt-3003.3-py3:centos-8 @@ -384,6 +476,11 @@ suites: - debian-9-master-py3 - ubuntu-2004-master-py3 - ubuntu-1804-master-py3 + - debian-11-3004-0-py3 + - debian-10-3004-0-py3 + - debian-9-3004-0-py3 + - ubuntu-2004-3004-0-py3 + - ubuntu-1804-3004-0-py3 - debian-11-3003-3-py3 - debian-10-3003-3-py3 - debian-9-3003-3-py3 @@ -416,6 +513,7 @@ suites: - path: test/integration/default - name: redhat includes: + - centos-stream8-tiamat-py3 - centos-8-tiamat-py3 - centos-7-tiamat-py3 - amazonlinux-2-tiamat-py3 @@ -423,6 +521,7 @@ suites: - oraclelinux-7-tiamat-py3 - almalinux-8-tiamat-py3 - rockylinux-8-tiamat-py3 + - centos-stream8-master-py3 - centos-8-master-py3 - centos-7-master-py3 - fedora-34-master-py3 @@ -432,6 +531,17 @@ suites: - oraclelinux-7-master-py3 - almalinux-8-master-py3 - rockylinux-8-master-py3 + - centos-stream8-3004-0-py3 + - centos-8-3004-0-py3 + - centos-7-3004-0-py3 + - fedora-34-3004-0-py3 + - fedora-33-3004-0-py3 + - amazonlinux-2-3004-0-py3 + - oraclelinux-8-3004-0-py3 + - oraclelinux-7-3004-0-py3 + - almalinux-8-3004-0-py3 + - rockylinux-8-3004-0-py3 + - centos-stream8-3003-3-py3 - centos-8-3003-3-py3 - centos-7-3003-3-py3 - fedora-34-3003-3-py3 @@ -475,6 +585,9 @@ suites: - opensuse-leap-153-master-py3 - opensuse-leap-152-master-py3 - opensuse-tmbl-latest-master-py3 + - opensuse-leap-153-3004-0-py3 + - opensuse-leap-152-3004-0-py3 + - opensuse-tmbl-latest-3004-0-py3 - opensuse-leap-153-3003-3-py3 - opensuse-leap-152-3003-3-py3 - opensuse-tmbl-latest-3003-3-py3