From 9762abfb4d3fecd5d4a9028c2e4a6e09667e7ceb Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 5 Oct 2021 11:08:30 +0100
Subject: [PATCH] ci(kitchen+ci): update with latest CVE pre-salted images
 [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/374
---
 .gitignore     |  1 +
 .gitlab-ci.yml | 32 +++++++++-----------
 .travis.yml    | 32 +++++++++-----------
 kitchen.yml    | 80 +++++++++++++++++++-------------------------------
 4 files changed, 60 insertions(+), 85 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94f77a8..39752a7 100644
--- 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
index c54ba80..4d2d2ff 100644
--- 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
index 8501214..c1776b9 100644
--- 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
index d0ab8fe..9e3cab0 100644
--- 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: