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

* Automated using myii/ssf-formula#374
saltstack-formulas · Oct 5, 2021 · 9762abf · 9762abf
1 parent 3ac3227
commit 9762abf
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 85 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
@@ -148,24 +148,20 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
 # preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
 ubuntu-1804-master-py3: {extends: '.test_instance'}
-# repositories-debian-11-3003-2-py3: {extends: '.test_instance'}
-# repositories-debian-10-3003-2-py3: {extends: '.test_instance'}
-# repositories-debian-9-3003-2-py3: {extends: '.test_instance'}
-# repositories-ubuntu-2004-3003-2-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-3003-2-py3: {extends: '.test_instance'}
-# repositories-debian-11-3002-6-py3: {extends: '.test_instance'}
-# repositories-debian-10-3002-6-py3: {extends: '.test_instance'}
-# repositories-debian-9-3002-6-py3: {extends: '.test_instance'}
-# repositories-ubuntu-2004-3002-6-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-3002-6-py3: {extends: '.test_instance'}
-# repositories-debian-10-3001-7-py3: {extends: '.test_instance'}
-# repositories-debian-9-3001-7-py3: {extends: '.test_instance'}
-# repositories-ubuntu-2004-3001-7-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-3001-7-py3: {extends: '.test_instance'}
-# repositories-debian-10-3000-9-py3: {extends: '.test_instance'}
-# repositories-debian-9-3000-9-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-3000-9-py3: {extends: '.test_instance'}
-# repositories-ubuntu-1804-3000-9-py2: {extends: '.test_instance'}
+# repositories-debian-11-3003-3-py3: {extends: '.test_instance'}
+# repositories-debian-10-3003-3-py3: {extends: '.test_instance'}
+# repositories-debian-9-3003-3-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# repositories-debian-11-3002-7-py3: {extends: '.test_instance'}
+# repositories-debian-10-3002-7-py3: {extends: '.test_instance'}
+# repositories-debian-9-3002-7-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# repositories-debian-10-3001-8-py3: {extends: '.test_instance'}
+# repositories-debian-9-3001-8-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
 
 ###############################################################################
 # `release` stage: `semantic-release`

diff --git a/.travis.yml b/.travis.yml
@@ -108,24 +108,20 @@ jobs:
     # - env: INSTANCE=preferences-ubuntu-1804-master-py3
     # - env: INSTANCE=unattended-ubuntu-1804-master-py3
     - env: INSTANCE=ubuntu-1804-master-py3
-    # - env: INSTANCE=repositories-debian-11-3003-2-py3
-    # - env: INSTANCE=repositories-debian-10-3003-2-py3
-    # - env: INSTANCE=repositories-debian-9-3003-2-py3
-    # - env: INSTANCE=repositories-ubuntu-2004-3003-2-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-3003-2-py3
-    # - env: INSTANCE=repositories-debian-11-3002-6-py3
-    # - env: INSTANCE=repositories-debian-10-3002-6-py3
-    # - env: INSTANCE=repositories-debian-9-3002-6-py3
-    # - env: INSTANCE=repositories-ubuntu-2004-3002-6-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-3002-6-py3
-    # - env: INSTANCE=repositories-debian-10-3001-7-py3
-    # - env: INSTANCE=repositories-debian-9-3001-7-py3
-    # - env: INSTANCE=repositories-ubuntu-2004-3001-7-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-3001-7-py3
-    # - env: INSTANCE=repositories-debian-10-3000-9-py3
-    # - env: INSTANCE=repositories-debian-9-3000-9-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py3
-    # - env: INSTANCE=repositories-ubuntu-1804-3000-9-py2
+    # - env: INSTANCE=repositories-debian-11-3003-3-py3
+    # - env: INSTANCE=repositories-debian-10-3003-3-py3
+    # - env: INSTANCE=repositories-debian-9-3003-3-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3003-3-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=repositories-debian-11-3002-7-py3
+    # - env: INSTANCE=repositories-debian-10-3002-7-py3
+    # - env: INSTANCE=repositories-debian-9-3002-7-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3002-7-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=repositories-debian-10-3001-8-py3
+    # - env: INSTANCE=repositories-debian-9-3001-8-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3001-8-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3001-8-py3
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.yml b/kitchen.yml
@@ -63,84 +63,66 @@ platforms:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
-  ## SALT `3003.2`
-  - name: debian-11-3003-2-py3
+  ## SALT `3003.3`
+  - name: debian-11-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-11
+      image: saltimages/salt-3003.3-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3003-2-py3
+  - name: debian-10-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-10
+      image: saltimages/salt-3003.3-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3003-2-py3
+  - name: debian-9-3003-3-py3
     driver:
-      image: saltimages/salt-3003.2-py3:debian-9
+      image: saltimages/salt-3003.3-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3003-2-py3
+  - 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: debian-11-3002-6-py3
+  ## SALT `3002.7`
+  - name: debian-11-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-11
+      image: saltimages/salt-3002.7-py3:debian-11
       run_command: /lib/systemd/systemd
-  - name: debian-10-3002-6-py3
+  - name: debian-10-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-10
+      image: saltimages/salt-3002.7-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3002-6-py3
+  - name: debian-9-3002-7-py3
     driver:
-      image: saltimages/salt-3002.6-py3:debian-9
+      image: saltimages/salt-3002.7-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3002-6-py3
+  - 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: debian-10-3001-7-py3
+  ## SALT `3001.8`
+  - name: debian-10-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-10
+      image: saltimages/salt-3001.8-py3:debian-10
       run_command: /lib/systemd/systemd
-  - name: debian-9-3001-7-py3
+  - name: debian-9-3001-8-py3
     driver:
-      image: saltimages/salt-3001.7-py3:debian-9
+      image: saltimages/salt-3001.8-py3:debian-9
       run_command: /lib/systemd/systemd
-  - name: ubuntu-2004-3001-7-py3
+  - 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: debian-10-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-10
-      run_command: /lib/systemd/systemd
-  - name: debian-9-3000-9-py3
-    driver:
-      image: saltimages/salt-3000.9-py3:debian-9
-      run_command: /lib/systemd/systemd
-  - 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: