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

* Automated using myii/ssf-formula#335
saltstack-formulas · Jul 1, 2021 · 324472c · 324472c
1 parent 7915be0
commit 324472c
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 23 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -128,16 +128,20 @@ rubocop:
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
+# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
+# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
 default-centos-8-master-py3: {extends: '.test_instance'}
 default-centos-7-master-py3: {extends: '.test_instance'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 default-oraclelinux-8-master-py3: {extends: '.test_instance'}
 default-oraclelinux-7-master-py3: {extends: '.test_instance'}
-# default-centos-8-3003-0-py3: {extends: '.test_instance'}
-# default-centos-7-3003-0-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-0-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-0-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3003-0-py3: {extends: '.test_instance'}
+default-almalinux-8-master-py3: {extends: '.test_instance'}
+default-rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-centos-8-3003-1-py3: {extends: '.test_instance'}
+# default-centos-7-3003-1-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-3003-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-1-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3003-1-py3: {extends: '.test_instance'}
 # default-centos-8-3002-6-py3: {extends: '.test_instance'}
 # default-centos-7-3002-6-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-3002-6-py3: {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
@@ -88,16 +88,20 @@ jobs:
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
+    # - env: INSTANCE=default-almalinux-8-tiamat-py3
+    # - env: INSTANCE=default-rockylinux-8-tiamat-py3
     - env: INSTANCE=default-centos-8-master-py3
     - env: INSTANCE=default-centos-7-master-py3
     - env: INSTANCE=default-amazonlinux-2-master-py3
     - env: INSTANCE=default-oraclelinux-8-master-py3
     - env: INSTANCE=default-oraclelinux-7-master-py3
-    # - env: INSTANCE=default-centos-8-3003-0-py3
-    # - env: INSTANCE=default-centos-7-3003-0-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-0-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-0-py3
-    # - env: INSTANCE=default-oraclelinux-7-3003-0-py3
+    - env: INSTANCE=default-almalinux-8-master-py3
+    - env: INSTANCE=default-rockylinux-8-master-py3
+    # - env: INSTANCE=default-centos-8-3003-1-py3
+    # - env: INSTANCE=default-centos-7-3003-1-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-1-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-1-py3
+    # - env: INSTANCE=default-oraclelinux-7-3003-1-py3
     # - env: INSTANCE=default-centos-8-3002-6-py3
     # - env: INSTANCE=default-centos-7-3002-6-py3
     # - env: INSTANCE=default-amazonlinux-2-3002-6-py3

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)

diff --git a/kitchen.yml b/kitchen.yml
@@ -26,6 +26,12 @@ platforms:
   - name: oraclelinux-7-tiamat-py3
     driver:
       image: saltimages/salt-tiamat-py3:oraclelinux-7
+  - name: almalinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:almalinux-8
+  - name: rockylinux-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:rockylinux-8
 
   ## SALT `master`
   - name: centos-8-master-py3
@@ -43,23 +49,29 @@ platforms:
   - name: oraclelinux-7-master-py3
     driver:
       image: saltimages/salt-master-py3:oraclelinux-7
+  - name: almalinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:almalinux-8
+  - name: rockylinux-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:rockylinux-8
 
-  ## SALT `3003.0`
-  - name: centos-8-3003-0-py3
+  ## SALT `3003.1`
+  - name: centos-8-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-8
-  - name: centos-7-3003-0-py3
+      image: saltimages/salt-3003.1-py3:centos-8
+  - name: centos-7-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:centos-7
-  - name: amazonlinux-2-3003-0-py3
+      image: saltimages/salt-3003.1-py3:centos-7
+  - name: amazonlinux-2-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:amazonlinux-2
-  - name: oraclelinux-8-3003-0-py3
+      image: saltimages/salt-3003.1-py3:amazonlinux-2
+  - name: oraclelinux-8-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-8
-  - name: oraclelinux-7-3003-0-py3
+      image: saltimages/salt-3003.1-py3:oraclelinux-8
+  - name: oraclelinux-7-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:oraclelinux-7
+      image: saltimages/salt-3003.1-py3:oraclelinux-7
 
   ## SALT `3002.6`
   - name: centos-8-3002-6-py3

diff --git a/test/integration/default/inspec.yml b/test/integration/default/inspec.yml
@@ -13,3 +13,5 @@ supports:
   - platform-name: centos
   - platform-name: amazon
   - platform-name: oracle
+  - platform-name: almalinux
+  - platform-name: rocky
diff --git a/test/integration/share/inspec.yml b/test/integration/share/inspec.yml
@@ -19,4 +19,6 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
   - platform: windows
diff --git a/test/integration/share/libraries/system.rb b/test/integration/share/libraries/system.rb
@@ -36,7 +36,7 @@ def build_platform_family
 
   def build_platform_name
     case inspec.platform[:name]
-    when 'amazon', 'oracle'
+    when 'amazon', 'oracle', 'rocky'
       "#{inspec.platform[:name]}linux"
     when /^windows_/
       inspec.platform[:family]