ci(kitchen+ci): update with latest CVE pre-salted images [skip ci]

* Automated using myii/ssf-formula#374
saltstack-formulas · Oct 5, 2021 · b86374e · b86374e
1 parent ff0eaef
commit b86374e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,6 +127,7 @@ tmp/
 # `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+!test/salt/pillar/top.sls
 
 # `suricata-formula` -- Platform binaries
 *.rpm

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -127,14 +127,12 @@ 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-2-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3003-2-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'}
-ubuntu-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-ubuntu-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# ubuntu-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+ubuntu-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -87,14 +87,12 @@ 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-2-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3003-2-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
-    - env: INSTANCE=ubuntu-ubuntu-1804-3001-7-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py3
-    - env: INSTANCE=ubuntu-ubuntu-1804-3000-9-py2
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3003-3-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3002-7-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=ubuntu-ubuntu-2004-3001-8-py3
+    - env: INSTANCE=ubuntu-ubuntu-1804-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -40,44 +40,34 @@ platforms:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3003.2`
-  - name: ubuntu-2004-3003-2-py3
+  ## SALT `3003.3`
+  - name: ubuntu-2004-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:ubuntu-20.04
+      image: saltimages/salt-3003.3-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3003-2-py3
+  - name: ubuntu-1804-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:ubuntu-18.04
+      image: saltimages/salt-3003.3-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3002.6`
-  - name: ubuntu-2004-3002-6-py3
+  ## SALT `3002.7`
+  - name: ubuntu-2004-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-20.04
+      image: saltimages/salt-3002.7-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3002-6-py3
+  - name: ubuntu-1804-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:ubuntu-18.04
+      image: saltimages/salt-3002.7-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3001.7`
-  - name: ubuntu-2004-3001-7-py3
+  ## SALT `3001.8`
+  - name: ubuntu-2004-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-20.04
+      image: saltimages/salt-3001.8-py3:ubuntu-20.04
       run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3001-7-py3
+  - name: ubuntu-1804-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-
-  ## SALT `3000.9`
-  - name: ubuntu-1804-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-  - name: ubuntu-1804-3000-9-py2
-    driver:
-      image: saltimages/salt-3000.9-py2:ubuntu-18.04
+      image: saltimages/salt-3001.8-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
 verifier: