From 380c6894b4c022ca4586693d8e9fd03845aa3b61 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Tue, 23 Nov 2021 10:30:18 +0000
Subject: [PATCH] ci(kitchen+ci): update with `3004` pre-salted images/boxes
 [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/385
---
 .gitlab-ci.yml | 14 +++++++++++++-
 .travis.yml    |  5 +++++
 CODEOWNERS     |  1 +
 kitchen.yml    | 22 ++++++++++++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d2d2ff..efb185e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,7 @@ rubocop:
 ###############################################################################
 # Define `test` template
 ###############################################################################
-.test_instance:
+.test_instance: &test_instance
   stage: *stage_test
   image: *image_dindruby
   services: *services_docker_dind
@@ -117,6 +117,13 @@ rubocop:
     # Alternative value to consider: `${CI_JOB_NAME}`
     - 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
 
+###############################################################################
+# Define `test` template (`allow_failure: true`)
+###############################################################################
+.test_instance_failure_permitted:
+  <<: *test_instance
+  allow_failure: true
+
 ###############################################################################
 # `test` stage: each instance below uses the `test` template above
 ###############################################################################
@@ -148,6 +155,11 @@ 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-3004-0-py3: {extends: '.test_instance'}
+# repositories-debian-10-3004-0-py3: {extends: '.test_instance'}
+# repositories-debian-9-3004-0-py3: {extends: '.test_instance'}
+# repositories-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
+# repositories-ubuntu-1804-3004-0-py3: {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'}
diff --git a/.travis.yml b/.travis.yml
index c1776b9..68db879 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,6 +108,11 @@ 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-3004-0-py3
+    # - env: INSTANCE=repositories-debian-10-3004-0-py3
+    # - env: INSTANCE=repositories-debian-9-3004-0-py3
+    # - env: INSTANCE=repositories-ubuntu-2004-3004-0-py3
+    # - env: INSTANCE=repositories-ubuntu-1804-3004-0-py3
     # - env: INSTANCE=repositories-debian-11-3003-3-py3
     # - env: INSTANCE=repositories-debian-10-3003-3-py3
     # - env: INSTANCE=repositories-debian-9-3003-3-py3
diff --git a/CODEOWNERS b/CODEOWNERS
index 2f7df79..3615886 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -22,6 +22,7 @@
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
+/test/salt/pillar/top.sls                   @saltstack-formulas/ssf
 /.gitignore                                 @saltstack-formulas/ssf
 /.cirrus.yml                                @saltstack-formulas/ssf
 /.gitlab-ci.yml                             @saltstack-formulas/ssf
diff --git a/kitchen.yml b/kitchen.yml
index 9e3cab0..140c94c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -63,6 +63,28 @@ platforms:
       image: saltimages/salt-master-py3:ubuntu-18.04
       run_command: /lib/systemd/systemd
 
+  ## SALT `3004.0`
+  - name: debian-11-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-11
+      run_command: /lib/systemd/systemd
+  - name: debian-10-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-10
+      run_command: /lib/systemd/systemd
+  - name: debian-9-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-9
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-2004-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+  - name: ubuntu-1804-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+
   ## SALT `3003.3`
   - name: debian-11-3003-3-py3
     driver: