Merge pull request #504 from myii/ci/add-3003

ci(kitchen+gitlab): adjust matrix to add `3003`
saltstack-formulas · Apr 22, 2021 · 18839da · 18839da
2 parents 6316991 + 480b7ed
commit 18839da
Show file tree

Hide file tree

Showing 38 changed files with 3,403 additions and 237 deletions.
diff --git a/.github/workflows/kitchen.vagrant.yml b/.github/workflows/kitchen.vagrant.yml
@@ -18,8 +18,8 @@ jobs:
           - v3002-py3-freebsd-122-3002-6-py3
           - v3002-py3-freebsd-114-3002-6-py3
           - v3001-py3-openbsd-68-3001-1-py3
-          - v3002-py3-windows-10-latest-py3
-          - v3002-py3-windows-81-latest-py3
+          - v3003-py3-windows-10-latest-py3
+          - v3003-py3-windows-81-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

diff --git a/.github/workflows/kitchen.windows.yml b/.github/workflows/kitchen.windows.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - v3002-py3-windows-2019-latest-py3
+          - v3003-py3-windows-2019-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'
@@ -61,7 +61,7 @@ jobs:
       fail-fast: false
       matrix:
         instance:
-          - v3002-py3-windows-2016-latest-py3
+          - v3003-py3-windows-2016-latest-py3
     steps:
       - name: 'Check out code'
         uses: 'actions/checkout@v2'

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -123,53 +123,68 @@ 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`
-v3002-py3-debian-10-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-debian-9-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-ubuntu-1804-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-ubuntu-1604-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-centos-8-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-centos-7-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-fedora-33-3002-5-py3: {extends: '.test_instance'}
-# v3002-py3-fedora-32-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-amazonlinux-2-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
-v3002-py3-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
-v3001-py3-debian-10-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-debian-9-3001-6-py3: {extends: '.test_instance'}
-v3001-py3-ubuntu-2004-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-ubuntu-1804-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-ubuntu-1604-3001-6-py3: {extends: '.test_instance'}
-v3001-py3-centos-8-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-centos-7-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-fedora-33-3001-6-py3: {extends: '.test_instance'}
-v3001-py3-fedora-32-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-opensuse-leap-152-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-opensuse-tmbl-latest-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-amazonlinux-2-3001-6-py3: {extends: '.test_instance'}
-v3001-py3-oraclelinux-8-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-oraclelinux-7-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-arch-base-latest-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
-# v3001-py3-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
-# v3000-py3-debian-10-3000-8-py3: {extends: '.test_instance'}
-v3000-py3-debian-9-3000-8-py3: {extends: '.test_instance'}
-v3000-py3-ubuntu-1804-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-ubuntu-1604-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-centos-8-3000-8-py3: {extends: '.test_instance'}
-v3000-py3-centos-7-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-opensuse-leap-152-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-amazonlinux-2-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-oraclelinux-8-3000-8-py3: {extends: '.test_instance'}
-v3000-py3-oraclelinux-7-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
-# v3000-py3-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
-# v3000-py2-ubuntu-1804-3000-8-py2: {extends: '.test_instance'}
-v3000-py2-ubuntu-1604-3000-8-py2: {extends: '.test_instance'}
-# v3000-py2-arch-base-latest-3000-8-py2: {extends: '.test_instance'}
+v3003-py3-debian-10-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-debian-9-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-centos-8-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-centos-7-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-fedora-34-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-fedora-33-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-fedora-32-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
+# v3003-py3-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
+v3003-py3-gentoo-stage3-systemd-3003-0-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-ubuntu-1604-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-fedora-32-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-5-py3: {extends: '.test_instance'}
+# v3002-py3-gentoo-stage3-systemd-3002-5-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-ubuntu-1604-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-fedora-32-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'}
+# 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-ubuntu-1604-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-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-py2-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+v3000-py2-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
+# v3000-py2-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -83,53 +83,68 @@ 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=v3002-py3-debian-10-3002-5-py3
-    - env: INSTANCE=v3002-py3-debian-9-3002-5-py3
-    - env: INSTANCE=v3002-py3-ubuntu-2004-3002-5-py3
-    - env: INSTANCE=v3002-py3-ubuntu-1804-3002-5-py3
-    - env: INSTANCE=v3002-py3-ubuntu-1604-3002-5-py3
-    - env: INSTANCE=v3002-py3-centos-8-3002-5-py3
-    - env: INSTANCE=v3002-py3-centos-7-3002-5-py3
-    - env: INSTANCE=v3002-py3-fedora-33-3002-5-py3
-    # - env: INSTANCE=v3002-py3-fedora-32-3002-5-py3
-    - env: INSTANCE=v3002-py3-amazonlinux-2-3002-5-py3
-    - env: INSTANCE=v3002-py3-oraclelinux-8-3002-5-py3
-    - env: INSTANCE=v3002-py3-oraclelinux-7-3002-5-py3
-    - env: INSTANCE=v3002-py3-arch-base-latest-3002-5-py3
-    - env: INSTANCE=v3002-py3-gentoo-stage3-latest-3002-5-py3
-    - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-py3
-    - env: INSTANCE=v3001-py3-debian-10-3001-6-py3
-    # - env: INSTANCE=v3001-py3-debian-9-3001-6-py3
-    - env: INSTANCE=v3001-py3-ubuntu-2004-3001-6-py3
-    # - env: INSTANCE=v3001-py3-ubuntu-1804-3001-6-py3
-    # - env: INSTANCE=v3001-py3-ubuntu-1604-3001-6-py3
-    - env: INSTANCE=v3001-py3-centos-8-3001-6-py3
-    # - env: INSTANCE=v3001-py3-centos-7-3001-6-py3
-    # - env: INSTANCE=v3001-py3-fedora-33-3001-6-py3
-    - env: INSTANCE=v3001-py3-fedora-32-3001-6-py3
-    # - env: INSTANCE=v3001-py3-opensuse-leap-152-3001-6-py3
-    # - env: INSTANCE=v3001-py3-opensuse-tmbl-latest-3001-6-py3
-    # - env: INSTANCE=v3001-py3-amazonlinux-2-3001-6-py3
-    - env: INSTANCE=v3001-py3-oraclelinux-8-3001-6-py3
-    # - env: INSTANCE=v3001-py3-oraclelinux-7-3001-6-py3
-    # - env: INSTANCE=v3001-py3-arch-base-latest-3001-6-py3
-    # - env: INSTANCE=v3001-py3-gentoo-stage3-latest-3001-6-py3
-    # - env: INSTANCE=v3001-py3-gentoo-stage3-systemd-3001-6-py3
-    # - env: INSTANCE=v3000-py3-debian-10-3000-8-py3
-    - env: INSTANCE=v3000-py3-debian-9-3000-8-py3
-    - env: INSTANCE=v3000-py3-ubuntu-1804-3000-8-py3
-    # - env: INSTANCE=v3000-py3-ubuntu-1604-3000-8-py3
-    # - env: INSTANCE=v3000-py3-centos-8-3000-8-py3
-    - env: INSTANCE=v3000-py3-centos-7-3000-8-py3
-    # - env: INSTANCE=v3000-py3-opensuse-leap-152-3000-8-py3
-    # - env: INSTANCE=v3000-py3-amazonlinux-2-3000-8-py3
-    # - env: INSTANCE=v3000-py3-oraclelinux-8-3000-8-py3
-    - env: INSTANCE=v3000-py3-oraclelinux-7-3000-8-py3
-    # - env: INSTANCE=v3000-py3-gentoo-stage3-latest-3000-8-py3
-    # - env: INSTANCE=v3000-py3-gentoo-stage3-systemd-3000-8-py3
-    # - env: INSTANCE=v3000-py2-ubuntu-1804-3000-8-py2
-    - env: INSTANCE=v3000-py2-ubuntu-1604-3000-8-py2
-    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-8-py2
+    - env: INSTANCE=v3003-py3-debian-10-3003-0-py3
+    # - env: INSTANCE=v3003-py3-debian-9-3003-0-py3
+    - env: INSTANCE=v3003-py3-ubuntu-2004-3003-0-py3
+    # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-0-py3
+    - env: INSTANCE=v3003-py3-centos-8-3003-0-py3
+    # - env: INSTANCE=v3003-py3-centos-7-3003-0-py3
+    # - env: INSTANCE=v3003-py3-fedora-34-3003-0-py3
+    # - env: INSTANCE=v3003-py3-fedora-33-3003-0-py3
+    # - env: INSTANCE=v3003-py3-fedora-32-3003-0-py3
+    - env: INSTANCE=v3003-py3-amazonlinux-2-3003-0-py3
+    - env: INSTANCE=v3003-py3-oraclelinux-8-3003-0-py3
+    # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-0-py3
+    - env: INSTANCE=v3003-py3-arch-base-latest-3003-0-py3
+    - env: INSTANCE=v3003-py3-gentoo-stage3-latest-3003-0-py3
+    - env: INSTANCE=v3003-py3-gentoo-stage3-systemd-3003-0-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-ubuntu-1604-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-fedora-32-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-5-py3
+    # - env: INSTANCE=v3002-py3-gentoo-stage3-systemd-3002-5-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-ubuntu-1604-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-fedora-32-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=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-ubuntu-1604-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-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-py2-ubuntu-1804-3000-9-py2
+    - env: INSTANCE=v3000-py2-ubuntu-1604-3000-9-py2
+    # - env: INSTANCE=v3000-py2-arch-base-latest-3000-9-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
@@ -18,6 +18,16 @@ driver:
   <% end %>
 
 platforms:
+  - name: freebsd-130-master-py3
+    driver:
+      box: myii/freebsd-13.0-master-py3
+      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
+  - 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-3002-6-py3
     driver:
       box: myii/freebsd-13.0-3002.6-py3

diff --git a/kitchen.windows.yml b/kitchen.windows.yml
@@ -15,7 +15,7 @@ platforms:
 
 provisioner:
   salt_install: bootstrap
-  salt_bootstrap_options: -pythonVersion 3 -version 3002.5
+  salt_bootstrap_options: -pythonVersion 3 -version 3003
   # yamllint disable rule:line-length
   init_environment: |
     C:\salt\salt-call --local state.single file.managed `