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

* Automated using myii/ssf-formula#335
saltstack-formulas · Jul 1, 2021 · 2daea51 · 2daea51
1 parent 2bbb7c8
commit 2daea51
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 11 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -127,8 +127,8 @@ rubocop:
 ubuntu-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-master-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-master-py3: {extends: '.test_instance'}
-# ubuntu-ubuntu-2004-3003-0-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3003-0-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-1-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3003-1-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
 ubuntu-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
 # ubuntu-ubuntu-2004-3001-7-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
@@ -87,8 +87,8 @@ jobs:
     - env: INSTANCE=ubuntu-ubuntu-1804-tiamat-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-master-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-master-py3
-    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-0-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3003-0-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-1-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3003-1-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-3002-6-py3
     - env: INSTANCE=ubuntu-ubuntu-1804-3002-6-py3
     # - env: INSTANCE=ubuntu-ubuntu-2004-3001-7-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,13 +26,13 @@ platforms:
     driver:
       image: saltimages/salt-master-py3:ubuntu-18.04
 
-  ## SALT `3003.0`
-  - name: ubuntu-2004-3003-0-py3
+  ## SALT `3003.1`
+  - name: ubuntu-2004-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-20.04
-  - name: ubuntu-1804-3003-0-py3
+      image: saltimages/salt-3003.1-py3:ubuntu-20.04
+  - name: ubuntu-1804-3003-1-py3
     driver:
-      image: saltimages/salt-3003.0-py3:ubuntu-18.04
+      image: saltimages/salt-3003.1-py3:ubuntu-18.04
 
   ## SALT `3002.6`
   - name: ubuntu-2004-3002-6-py3

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]

diff --git a/test/integration/ubuntu/inspec.yml b/test/integration/ubuntu/inspec.yml
@@ -22,4 +22,6 @@ supports:
   - platform-name: oracle
   - platform-name: arch
   - platform-name: gentoo
+  - platform-name: almalinux
+  - platform-name: rocky
   - platform: windows