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

* Automated using myii/ssf-formula#335
saltstack-formulas · Jul 2, 2021 · 5cb60ef · 5cb60ef
1 parent 1012c4c
commit 5cb60ef
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 147 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -127,12 +127,13 @@ rubocop:
 # java-debian-9-tiamat-py3: {extends: '.test_instance'}
 # java-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # java-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
-# java-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
 # java-centos-8-tiamat-py3: {extends: '.test_instance'}
 # java-centos-7-tiamat-py3: {extends: '.test_instance'}
 # java-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # java-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # java-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
+# java-almalinux-8-tiamat-py3: {extends: '.test_instance'}
+# java-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
 # java-debian-10-master-py3: {extends: '.test_instance'}
 # cpp-debian-10-master-py3: {extends: '.test_instance'}
 # javascript-debian-10-master-py3: {extends: '.test_instance'}
@@ -145,9 +146,6 @@ rubocop:
 # java-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # cpp-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # javascript-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# java-ubuntu-1604-master-py3: {extends: '.test_instance'}
-# cpp-ubuntu-1604-master-py3: {extends: '.test_instance'}
-# javascript-ubuntu-1604-master-py3: {extends: '.test_instance'}
 # java-centos-8-master-py3: {extends: '.test_instance'}
 # cpp-centos-8-master-py3: {extends: '.test_instance'}
 # javascript-centos-8-master-py3: {extends: '.test_instance'}
@@ -160,9 +158,9 @@ rubocop:
 # java-fedora-33-master-py3: {extends: '.test_instance'}
 # cpp-fedora-33-master-py3: {extends: '.test_instance'}
 # javascript-fedora-33-master-py3: {extends: '.test_instance'}
-# java-fedora-32-master-py3: {extends: '.test_instance'}
-# cpp-fedora-32-master-py3: {extends: '.test_instance'}
-# javascript-fedora-32-master-py3: {extends: '.test_instance'}
+# java-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# cpp-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# javascript-opensuse-leap-153-master-py3: {extends: '.test_instance'}
 # java-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # cpp-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # javascript-opensuse-leap-152-master-py3: {extends: '.test_instance'}
@@ -187,72 +185,77 @@ rubocop:
 # java-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # cpp-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # javascript-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-# java-debian-10-3003-0-py3: {extends: '.test_instance'}
-# java-debian-9-3003-0-py3: {extends: '.test_instance'}
-# java-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
-# java-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
-# java-centos-8-3003-0-py3: {extends: '.test_instance'}
-# java-centos-7-3003-0-py3: {extends: '.test_instance'}
-# java-fedora-34-3003-0-py3: {extends: '.test_instance'}
-# java-fedora-33-3003-0-py3: {extends: '.test_instance'}
-# java-fedora-32-3003-0-py3: {extends: '.test_instance'}
-# java-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
-# java-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
-# java-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
-# java-arch-base-latest-3003-0-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-latest-3003-0-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-systemd-3003-0-py3: {extends: '.test_instance'}
+# java-almalinux-8-master-py3: {extends: '.test_instance'}
+# cpp-almalinux-8-master-py3: {extends: '.test_instance'}
+# javascript-almalinux-8-master-py3: {extends: '.test_instance'}
+# java-rockylinux-8-master-py3: {extends: '.test_instance'}
+# cpp-rockylinux-8-master-py3: {extends: '.test_instance'}
+# javascript-rockylinux-8-master-py3: {extends: '.test_instance'}
+# java-debian-10-3003-1-py3: {extends: '.test_instance'}
+# java-debian-9-3003-1-py3: {extends: '.test_instance'}
+# java-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
+# java-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
+# java-centos-8-3003-1-py3: {extends: '.test_instance'}
+# java-centos-7-3003-1-py3: {extends: '.test_instance'}
+# java-fedora-34-3003-1-py3: {extends: '.test_instance'}
+# java-fedora-33-3003-1-py3: {extends: '.test_instance'}
+# java-opensuse-leap-153-3003-1-py3: {extends: '.test_instance'}
+# java-opensuse-leap-152-3003-1-py3: {extends: '.test_instance'}
+# java-opensuse-tmbl-latest-3003-1-py3: {extends: '.test_instance'}
+# java-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
+# java-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
+# java-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
+# java-arch-base-latest-3003-1-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-latest-3003-1-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-systemd-3003-1-py3: {extends: '.test_instance'}
 # java-debian-10-3002-6-py3: {extends: '.test_instance'}
 # java-debian-9-3002-6-py3: {extends: '.test_instance'}
 # java-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
 # java-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# java-ubuntu-1604-3002-6-py3: {extends: '.test_instance'}
 # java-centos-8-3002-6-py3: {extends: '.test_instance'}
 # java-centos-7-3002-6-py3: {extends: '.test_instance'}
 # java-fedora-34-3002-6-py3: {extends: '.test_instance'}
 # java-fedora-33-3002-6-py3: {extends: '.test_instance'}
-# java-fedora-32-3002-6-py3: {extends: '.test_instance'}
 # java-amazonlinux-2-3002-6-py3: {extends: '.test_instance'}
 # java-oraclelinux-8-3002-6-py3: {extends: '.test_instance'}
 # java-oraclelinux-7-3002-6-py3: {extends: '.test_instance'}
 # java-arch-base-latest-3002-6-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-latest-3002-6-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-systemd-3002-6-py3: {extends: '.test_instance'}
+# java-opensuse-leap-153-3002-2-py3: {extends: '.test_instance'}
 # java-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
 # java-opensuse-tmbl-latest-3002-2-py3: {extends: '.test_instance'}
 # java-debian-10-3001-7-py3: {extends: '.test_instance'}
 # java-debian-9-3001-7-py3: {extends: '.test_instance'}
 # java-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
 # java-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# java-ubuntu-1604-3001-7-py3: {extends: '.test_instance'}
 # java-centos-8-3001-7-py3: {extends: '.test_instance'}
 # java-centos-7-3001-7-py3: {extends: '.test_instance'}
 # java-fedora-34-3001-7-py3: {extends: '.test_instance'}
 # java-fedora-33-3001-7-py3: {extends: '.test_instance'}
-# java-fedora-32-3001-7-py3: {extends: '.test_instance'}
+# java-opensuse-leap-153-3001-7-py3: {extends: '.test_instance'}
 # java-opensuse-leap-152-3001-7-py3: {extends: '.test_instance'}
 # java-opensuse-tmbl-latest-3001-7-py3: {extends: '.test_instance'}
 # java-amazonlinux-2-3001-7-py3: {extends: '.test_instance'}
 # java-oraclelinux-8-3001-7-py3: {extends: '.test_instance'}
 # java-oraclelinux-7-3001-7-py3: {extends: '.test_instance'}
 # java-arch-base-latest-3001-7-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-latest-3001-6-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-systemd-3001-6-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-latest-3001-7-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-systemd-3001-7-py3: {extends: '.test_instance'}
 # java-debian-10-3000-9-py3: {extends: '.test_instance'}
 # java-debian-9-3000-9-py3: {extends: '.test_instance'}
 # java-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# java-ubuntu-1604-3000-9-py3: {extends: '.test_instance'}
 # java-centos-8-3000-9-py3: {extends: '.test_instance'}
 # java-centos-7-3000-9-py3: {extends: '.test_instance'}
+# java-opensuse-leap-153-3000-9-py3: {extends: '.test_instance'}
 # java-opensuse-leap-152-3000-9-py3: {extends: '.test_instance'}
 # java-amazonlinux-2-3000-9-py3: {extends: '.test_instance'}
 # java-oraclelinux-8-3000-9-py3: {extends: '.test_instance'}
 # java-oraclelinux-7-3000-9-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-latest-3000-9-py3: {extends: '.test_instance'}
+# java-gentoo-stage3-systemd-3000-9-py3: {extends: '.test_instance'}
 # java-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
-# java-ubuntu-1604-3000-9-py2: {extends: '.test_instance'}
 # java-arch-base-latest-3000-9-py2: {extends: '.test_instance'}
-# java-gentoo-stage3-latest-3000-8-py3: {extends: '.test_instance'}
-# java-gentoo-stage3-systemd-3000-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

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
@@ -87,12 +87,13 @@ jobs:
     # - env: INSTANCE=java-debian-9-tiamat-py3
     # - env: INSTANCE=java-ubuntu-2004-tiamat-py3
     # - env: INSTANCE=java-ubuntu-1804-tiamat-py3
-    # - env: INSTANCE=java-ubuntu-1604-tiamat-py3
     # - env: INSTANCE=java-centos-8-tiamat-py3
     # - env: INSTANCE=java-centos-7-tiamat-py3
     # - env: INSTANCE=java-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=java-oraclelinux-8-tiamat-py3
     # - env: INSTANCE=java-oraclelinux-7-tiamat-py3
+    # - env: INSTANCE=java-almalinux-8-tiamat-py3
+    # - env: INSTANCE=java-rockylinux-8-tiamat-py3
     # - env: INSTANCE=java-debian-10-master-py3
     # - env: INSTANCE=cpp-debian-10-master-py3
     # - env: INSTANCE=javascript-debian-10-master-py3
@@ -105,9 +106,6 @@ jobs:
     # - env: INSTANCE=java-ubuntu-1804-master-py3
     # - env: INSTANCE=cpp-ubuntu-1804-master-py3
     # - env: INSTANCE=javascript-ubuntu-1804-master-py3
-    # - env: INSTANCE=java-ubuntu-1604-master-py3
-    # - env: INSTANCE=cpp-ubuntu-1604-master-py3
-    # - env: INSTANCE=javascript-ubuntu-1604-master-py3
     # - env: INSTANCE=java-centos-8-master-py3
     # - env: INSTANCE=cpp-centos-8-master-py3
     # - env: INSTANCE=javascript-centos-8-master-py3
@@ -120,9 +118,9 @@ jobs:
     # - env: INSTANCE=java-fedora-33-master-py3
     # - env: INSTANCE=cpp-fedora-33-master-py3
     # - env: INSTANCE=javascript-fedora-33-master-py3
-    # - env: INSTANCE=java-fedora-32-master-py3
-    # - env: INSTANCE=cpp-fedora-32-master-py3
-    # - env: INSTANCE=javascript-fedora-32-master-py3
+    # - env: INSTANCE=java-opensuse-leap-153-master-py3
+    # - env: INSTANCE=cpp-opensuse-leap-153-master-py3
+    # - env: INSTANCE=javascript-opensuse-leap-153-master-py3
     # - env: INSTANCE=java-opensuse-leap-152-master-py3
     # - env: INSTANCE=cpp-opensuse-leap-152-master-py3
     # - env: INSTANCE=javascript-opensuse-leap-152-master-py3
@@ -147,72 +145,77 @@ jobs:
     # - env: INSTANCE=java-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=cpp-gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=javascript-gentoo-stage3-systemd-master-py3
-    # - env: INSTANCE=java-debian-10-3003-0-py3
-    # - env: INSTANCE=java-debian-9-3003-0-py3
-    # - env: INSTANCE=java-ubuntu-2004-3003-0-py3
-    # - env: INSTANCE=java-ubuntu-1804-3003-0-py3
-    # - env: INSTANCE=java-centos-8-3003-0-py3
-    # - env: INSTANCE=java-centos-7-3003-0-py3
-    # - env: INSTANCE=java-fedora-34-3003-0-py3
-    # - env: INSTANCE=java-fedora-33-3003-0-py3
-    # - env: INSTANCE=java-fedora-32-3003-0-py3
-    # - env: INSTANCE=java-amazonlinux-2-3003-0-py3
-    # - env: INSTANCE=java-oraclelinux-8-3003-0-py3
-    # - env: INSTANCE=java-oraclelinux-7-3003-0-py3
-    # - env: INSTANCE=java-arch-base-latest-3003-0-py3
-    # - env: INSTANCE=java-gentoo-stage3-latest-3003-0-py3
-    # - env: INSTANCE=java-gentoo-stage3-systemd-3003-0-py3
+    # - env: INSTANCE=java-almalinux-8-master-py3
+    # - env: INSTANCE=cpp-almalinux-8-master-py3
+    # - env: INSTANCE=javascript-almalinux-8-master-py3
+    # - env: INSTANCE=java-rockylinux-8-master-py3
+    # - env: INSTANCE=cpp-rockylinux-8-master-py3
+    # - env: INSTANCE=javascript-rockylinux-8-master-py3
+    # - env: INSTANCE=java-debian-10-3003-1-py3
+    # - env: INSTANCE=java-debian-9-3003-1-py3
+    # - env: INSTANCE=java-ubuntu-2004-3003-1-py3
+    # - env: INSTANCE=java-ubuntu-1804-3003-1-py3
+    # - env: INSTANCE=java-centos-8-3003-1-py3
+    # - env: INSTANCE=java-centos-7-3003-1-py3
+    # - env: INSTANCE=java-fedora-34-3003-1-py3
+    # - env: INSTANCE=java-fedora-33-3003-1-py3
+    # - env: INSTANCE=java-opensuse-leap-153-3003-1-py3
+    # - env: INSTANCE=java-opensuse-leap-152-3003-1-py3
+    # - env: INSTANCE=java-opensuse-tmbl-latest-3003-1-py3
+    # - env: INSTANCE=java-amazonlinux-2-3003-1-py3
+    # - env: INSTANCE=java-oraclelinux-8-3003-1-py3
+    # - env: INSTANCE=java-oraclelinux-7-3003-1-py3
+    # - env: INSTANCE=java-arch-base-latest-3003-1-py3
+    # - env: INSTANCE=java-gentoo-stage3-latest-3003-1-py3
+    # - env: INSTANCE=java-gentoo-stage3-systemd-3003-1-py3
     # - env: INSTANCE=java-debian-10-3002-6-py3
     # - env: INSTANCE=java-debian-9-3002-6-py3
     # - env: INSTANCE=java-ubuntu-2004-3002-6-py3
     # - env: INSTANCE=java-ubuntu-1804-3002-6-py3
-    # - env: INSTANCE=java-ubuntu-1604-3002-6-py3
     # - env: INSTANCE=java-centos-8-3002-6-py3
     # - env: INSTANCE=java-centos-7-3002-6-py3
     # - env: INSTANCE=java-fedora-34-3002-6-py3
     # - env: INSTANCE=java-fedora-33-3002-6-py3
-    # - env: INSTANCE=java-fedora-32-3002-6-py3
     # - env: INSTANCE=java-amazonlinux-2-3002-6-py3
     # - env: INSTANCE=java-oraclelinux-8-3002-6-py3
     # - env: INSTANCE=java-oraclelinux-7-3002-6-py3
     # - env: INSTANCE=java-arch-base-latest-3002-6-py3
-    # - env: INSTANCE=java-gentoo-stage3-latest-3002-5-py3
-    # - env: INSTANCE=java-gentoo-stage3-systemd-3002-5-py3
+    # - env: INSTANCE=java-gentoo-stage3-latest-3002-6-py3
+    # - env: INSTANCE=java-gentoo-stage3-systemd-3002-6-py3
+    # - env: INSTANCE=java-opensuse-leap-153-3002-2-py3
     # - env: INSTANCE=java-opensuse-leap-152-3002-2-py3
     # - env: INSTANCE=java-opensuse-tmbl-latest-3002-2-py3
     # - env: INSTANCE=java-debian-10-3001-7-py3
     # - env: INSTANCE=java-debian-9-3001-7-py3
     # - env: INSTANCE=java-ubuntu-2004-3001-7-py3
     # - env: INSTANCE=java-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=java-ubuntu-1604-3001-7-py3
     # - env: INSTANCE=java-centos-8-3001-7-py3
     # - env: INSTANCE=java-centos-7-3001-7-py3
     # - env: INSTANCE=java-fedora-34-3001-7-py3
     # - env: INSTANCE=java-fedora-33-3001-7-py3
-    # - env: INSTANCE=java-fedora-32-3001-7-py3
+    # - env: INSTANCE=java-opensuse-leap-153-3001-7-py3
     # - env: INSTANCE=java-opensuse-leap-152-3001-7-py3
     # - env: INSTANCE=java-opensuse-tmbl-latest-3001-7-py3
     # - env: INSTANCE=java-amazonlinux-2-3001-7-py3
     # - env: INSTANCE=java-oraclelinux-8-3001-7-py3
     # - env: INSTANCE=java-oraclelinux-7-3001-7-py3
     # - env: INSTANCE=java-arch-base-latest-3001-7-py3
-    # - env: INSTANCE=java-gentoo-stage3-latest-3001-6-py3
-    # - env: INSTANCE=java-gentoo-stage3-systemd-3001-6-py3
+    # - env: INSTANCE=java-gentoo-stage3-latest-3001-7-py3
+    # - env: INSTANCE=java-gentoo-stage3-systemd-3001-7-py3
     # - env: INSTANCE=java-debian-10-3000-9-py3
     # - env: INSTANCE=java-debian-9-3000-9-py3
     # - env: INSTANCE=java-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=java-ubuntu-1604-3000-9-py3
     # - env: INSTANCE=java-centos-8-3000-9-py3
     # - env: INSTANCE=java-centos-7-3000-9-py3
+    # - env: INSTANCE=java-opensuse-leap-153-3000-9-py3
     # - env: INSTANCE=java-opensuse-leap-152-3000-9-py3
     # - env: INSTANCE=java-amazonlinux-2-3000-9-py3
     # - env: INSTANCE=java-oraclelinux-8-3000-9-py3
     # - env: INSTANCE=java-oraclelinux-7-3000-9-py3
+    # - env: INSTANCE=java-gentoo-stage3-latest-3000-9-py3
+    # - env: INSTANCE=java-gentoo-stage3-systemd-3000-9-py3
     # - env: INSTANCE=java-ubuntu-1804-3000-9-py2
-    # - env: INSTANCE=java-ubuntu-1604-3000-9-py2
     # - env: INSTANCE=java-arch-base-latest-3000-9-py2
-    # - env: INSTANCE=java-gentoo-stage3-latest-3000-8-py3
-    # - env: INSTANCE=java-gentoo-stage3-systemd-3000-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

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)