ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]

* Automated using myii/ssf-formula#335
saltstack-formulas · Jul 1, 2021 · 0e62858 · 0e62858
1 parent 226a187
commit 0e62858
Show file tree

Hide file tree

Showing 12 changed files with 215 additions and 100 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -123,20 +123,23 @@ 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-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-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'}
+v3003-py3-debian-10-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-debian-9-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-centos-8-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-centos-7-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-fedora-34-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-fedora-33-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
+v3003-py3-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
+# v3003-py3-oraclelinux-7-3003-1-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-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'}
@@ -149,8 +152,9 @@ 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-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'}
@@ -161,21 +165,27 @@ 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'}
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -52,3 +52,14 @@ repos:
       - id: rstcheck
         name: Check reST files using rstcheck
         exclude: 'docs/CHANGELOG.rst'
+  - repo: https://github.com/saltstack-formulas/mirrors-rst-lint
+    rev: v1.3.2
+    hooks:
+      - id: rst-lint
+        name: Check reST files using rst-lint
+        exclude: |
+            (?x)^(
+                docs/CHANGELOG.rst|
+                docs/TOFS_pattern.rst|
+            )$
+        additional_dependencies: [pygments==2.9.0]
diff --git a/.travis.yml b/.travis.yml
@@ -83,20 +83,23 @@ 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-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-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=v3003-py3-debian-10-3003-1-py3
+    # - env: INSTANCE=v3003-py3-debian-9-3003-1-py3
+    - env: INSTANCE=v3003-py3-ubuntu-2004-3003-1-py3
+    # - env: INSTANCE=v3003-py3-ubuntu-1804-3003-1-py3
+    - env: INSTANCE=v3003-py3-centos-8-3003-1-py3
+    # - env: INSTANCE=v3003-py3-centos-7-3003-1-py3
+    - env: INSTANCE=v3003-py3-fedora-34-3003-1-py3
+    - env: INSTANCE=v3003-py3-fedora-33-3003-1-py3
+    # - env: INSTANCE=v3003-py3-opensuse-leap-153-3003-1-py3
+    # - env: INSTANCE=v3003-py3-opensuse-leap-152-3003-1-py3
+    # - env: INSTANCE=v3003-py3-opensuse-tmbl-latest-3003-1-py3
+    - env: INSTANCE=v3003-py3-amazonlinux-2-3003-1-py3
+    - env: INSTANCE=v3003-py3-oraclelinux-8-3003-1-py3
+    # - env: INSTANCE=v3003-py3-oraclelinux-7-3003-1-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-10-3002-6-py3
     - env: INSTANCE=v3002-py3-debian-9-3002-6-py3
     - env: INSTANCE=v3002-py3-ubuntu-2004-3002-6-py3
@@ -109,8 +112,9 @@ jobs:
     # - 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-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
@@ -121,21 +125,27 @@ jobs:
     # - 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
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 042e6921940a28d2502258b6a5ff3be17dd2fd37
+  revision: 1f543f654da5c1774cb8737f6f07a01745520bb5
   branch: ssf
   specs:
     kitchen-docker (2.10.0)