From 9ea8e3ddce2ebab4d5b1f286d9fceba6eb1734e7 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Mon, 30 Aug 2021 15:53:14 +0100
Subject: [PATCH] ci: review #78, fix verification files & standardise
 structure [skip ci]

* Semi-automated using https://github.com/myii/ssf-formula/pull/363
---
 .gitlab-ci.yml                                | 80 ++++++++++++++-----
 .travis.yml                                   | 80 ++++++++++++++-----
 .../files/_mapdata/gentoo-2-sysd.yaml         |  2 +-
 .../files/_mapdata/gentoo-2-sysv.yaml         |  2 +-
 test/integration/appended/inspec.yml          |  3 +-
 5 files changed, 124 insertions(+), 43 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e63dd6d..515fc25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -135,26 +135,66 @@ rubocop:
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
 # default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
-default-debian-11-master-py3: {extends: '.test_instance'}
-default-debian-10-master-py3: {extends: '.test_instance'}
-appended-debian-9-master-py3: {extends: '.test_instance'}
-default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-default-ubuntu-1804-master-py3: {extends: '.test_instance'}
-default-centos-8-master-py3: {extends: '.test_instance'}
-appended-centos-7-master-py3: {extends: '.test_instance'}
-default-fedora-34-master-py3: {extends: '.test_instance'}
-default-fedora-33-master-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
-appended-opensuse-leap-152-master-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
-default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-default-oraclelinux-8-master-py3: {extends: '.test_instance'}
-appended-oraclelinux-7-master-py3: {extends: '.test_instance'}
-default-arch-base-latest-master-py3: {extends: '.test_instance'}
-default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
-default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
-default-almalinux-8-master-py3: {extends: '.test_instance'}
-default-rockylinux-8-master-py3: {extends: '.test_instance'}
+# default-debian-11-master-py3: {extends: '.test_instance'}
+# appended-debian-11-master-py3: {extends: '.test_instance'}
+debian-11-master-py3: {extends: '.test_instance'}
+# default-debian-10-master-py3: {extends: '.test_instance'}
+# appended-debian-10-master-py3: {extends: '.test_instance'}
+debian-10-master-py3: {extends: '.test_instance'}
+# default-debian-9-master-py3: {extends: '.test_instance'}
+# appended-debian-9-master-py3: {extends: '.test_instance'}
+debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# appended-ubuntu-2004-master-py3: {extends: '.test_instance'}
+ubuntu-2004-master-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# appended-ubuntu-1804-master-py3: {extends: '.test_instance'}
+ubuntu-1804-master-py3: {extends: '.test_instance'}
+# default-centos-8-master-py3: {extends: '.test_instance'}
+# appended-centos-8-master-py3: {extends: '.test_instance'}
+centos-8-master-py3: {extends: '.test_instance'}
+# default-centos-7-master-py3: {extends: '.test_instance'}
+# appended-centos-7-master-py3: {extends: '.test_instance'}
+centos-7-master-py3: {extends: '.test_instance'}
+# default-fedora-34-master-py3: {extends: '.test_instance'}
+# appended-fedora-34-master-py3: {extends: '.test_instance'}
+fedora-34-master-py3: {extends: '.test_instance'}
+# default-fedora-33-master-py3: {extends: '.test_instance'}
+# appended-fedora-33-master-py3: {extends: '.test_instance'}
+fedora-33-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# appended-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# appended-opensuse-leap-152-master-py3: {extends: '.test_instance'}
+opensuse-leap-152-master-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# appended-opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
+# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
+# appended-amazonlinux-2-master-py3: {extends: '.test_instance'}
+amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# appended-oraclelinux-8-master-py3: {extends: '.test_instance'}
+oraclelinux-8-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# appended-oraclelinux-7-master-py3: {extends: '.test_instance'}
+oraclelinux-7-master-py3: {extends: '.test_instance'}
+# default-arch-base-latest-master-py3: {extends: '.test_instance'}
+# appended-arch-base-latest-master-py3: {extends: '.test_instance'}
+arch-base-latest-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+# appended-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# appended-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
+# default-almalinux-8-master-py3: {extends: '.test_instance'}
+# appended-almalinux-8-master-py3: {extends: '.test_instance'}
+almalinux-8-master-py3: {extends: '.test_instance'}
+# default-rockylinux-8-master-py3: {extends: '.test_instance'}
+# appended-rockylinux-8-master-py3: {extends: '.test_instance'}
+rockylinux-8-master-py3: {extends: '.test_instance'}
 # default-debian-11-3003-2-py3: {extends: '.test_instance'}
 # default-debian-10-3003-2-py3: {extends: '.test_instance'}
 # default-debian-9-3003-2-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index 6f1b5aa..d2d605b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,26 +95,66 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-7-tiamat-py3
     # - env: INSTANCE=default-almalinux-8-tiamat-py3
     # - env: INSTANCE=default-rockylinux-8-tiamat-py3
-    - env: INSTANCE=default-debian-11-master-py3
-    - env: INSTANCE=default-debian-10-master-py3
-    - env: INSTANCE=default-debian-9-master-py3
-    - env: INSTANCE=default-ubuntu-2004-master-py3
-    - env: INSTANCE=default-ubuntu-1804-master-py3
-    - env: INSTANCE=default-centos-8-master-py3
-    - env: INSTANCE=default-centos-7-master-py3
-    - env: INSTANCE=default-fedora-34-master-py3
-    - env: INSTANCE=default-fedora-33-master-py3
-    - env: INSTANCE=default-opensuse-leap-153-master-py3
-    - env: INSTANCE=default-opensuse-leap-152-master-py3
-    - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
-    - env: INSTANCE=default-amazonlinux-2-master-py3
-    - env: INSTANCE=default-oraclelinux-8-master-py3
-    - env: INSTANCE=default-oraclelinux-7-master-py3
-    - env: INSTANCE=default-arch-base-latest-master-py3
-    - env: INSTANCE=default-gentoo-stage3-latest-master-py3
-    - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
-    - env: INSTANCE=default-almalinux-8-master-py3
-    - env: INSTANCE=default-rockylinux-8-master-py3
+    # - env: INSTANCE=default-debian-11-master-py3
+    # - env: INSTANCE=appended-debian-11-master-py3
+    - env: INSTANCE=debian-11-master-py3
+    # - env: INSTANCE=default-debian-10-master-py3
+    # - env: INSTANCE=appended-debian-10-master-py3
+    - env: INSTANCE=debian-10-master-py3
+    # - env: INSTANCE=default-debian-9-master-py3
+    # - env: INSTANCE=appended-debian-9-master-py3
+    - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=default-ubuntu-2004-master-py3
+    # - env: INSTANCE=appended-ubuntu-2004-master-py3
+    - env: INSTANCE=ubuntu-2004-master-py3
+    # - env: INSTANCE=default-ubuntu-1804-master-py3
+    # - env: INSTANCE=appended-ubuntu-1804-master-py3
+    - env: INSTANCE=ubuntu-1804-master-py3
+    # - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=appended-centos-8-master-py3
+    - env: INSTANCE=centos-8-master-py3
+    # - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=appended-centos-7-master-py3
+    - env: INSTANCE=centos-7-master-py3
+    # - env: INSTANCE=default-fedora-34-master-py3
+    # - env: INSTANCE=appended-fedora-34-master-py3
+    - env: INSTANCE=fedora-34-master-py3
+    # - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=appended-fedora-33-master-py3
+    - env: INSTANCE=fedora-33-master-py3
+    # - env: INSTANCE=default-opensuse-leap-153-master-py3
+    # - env: INSTANCE=appended-opensuse-leap-153-master-py3
+    - env: INSTANCE=opensuse-leap-153-master-py3
+    # - env: INSTANCE=default-opensuse-leap-152-master-py3
+    # - env: INSTANCE=appended-opensuse-leap-152-master-py3
+    - env: INSTANCE=opensuse-leap-152-master-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+    # - env: INSTANCE=appended-opensuse-tmbl-latest-master-py3
+    - env: INSTANCE=opensuse-tmbl-latest-master-py3
+    # - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=appended-amazonlinux-2-master-py3
+    - env: INSTANCE=amazonlinux-2-master-py3
+    # - env: INSTANCE=default-oraclelinux-8-master-py3
+    # - env: INSTANCE=appended-oraclelinux-8-master-py3
+    - env: INSTANCE=oraclelinux-8-master-py3
+    # - env: INSTANCE=default-oraclelinux-7-master-py3
+    # - env: INSTANCE=appended-oraclelinux-7-master-py3
+    - env: INSTANCE=oraclelinux-7-master-py3
+    # - env: INSTANCE=default-arch-base-latest-master-py3
+    # - env: INSTANCE=appended-arch-base-latest-master-py3
+    - env: INSTANCE=arch-base-latest-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    # - env: INSTANCE=appended-gentoo-stage3-latest-master-py3
+    - env: INSTANCE=gentoo-stage3-latest-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=appended-gentoo-stage3-systemd-master-py3
+    - env: INSTANCE=gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=default-almalinux-8-master-py3
+    # - env: INSTANCE=appended-almalinux-8-master-py3
+    - env: INSTANCE=almalinux-8-master-py3
+    # - env: INSTANCE=default-rockylinux-8-master-py3
+    # - env: INSTANCE=appended-rockylinux-8-master-py3
+    - env: INSTANCE=rockylinux-8-master-py3
     # - env: INSTANCE=default-debian-11-3003-2-py3
     # - env: INSTANCE=default-debian-10-3003-2-py3
     # - env: INSTANCE=default-debian-9-3003-2-py3
diff --git a/test/integration/appended/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/appended/files/_mapdata/gentoo-2-sysd.yaml
index 4709d13..20b3673 100644
--- a/test/integration/appended/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/appended/files/_mapdata/gentoo-2-sysd.yaml
@@ -22,7 +22,7 @@ values:
         - ALL=(ALL) ALL
   includedir: /etc/sudoers.d
   manage_main_config: false
-  pkg: sudo
+  pkg: app-admin/sudo
   purge_includedir: false
   users:
     kitchen:
diff --git a/test/integration/appended/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/appended/files/_mapdata/gentoo-2-sysv.yaml
index 4709d13..20b3673 100644
--- a/test/integration/appended/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/appended/files/_mapdata/gentoo-2-sysv.yaml
@@ -22,7 +22,7 @@ values:
         - ALL=(ALL) ALL
   includedir: /etc/sudoers.d
   manage_main_config: false
-  pkg: sudo
+  pkg: app-admin/sudo
   purge_includedir: false
   users:
     kitchen:
diff --git a/test/integration/appended/inspec.yml b/test/integration/appended/inspec.yml
index 8c9089d..f833e3f 100644
--- a/test/integration/appended/inspec.yml
+++ b/test/integration/appended/inspec.yml
@@ -5,7 +5,8 @@ name: appended
 title: sudoers formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
-summary: Verify that the sudoers formula is setup and configured correctly
+# yamllint disable-line rule:line-length
+summary: Verify that the sudoers formula is setup and configured correctly (when appending to the main file)
 depends:
   - name: share
     path: test/integration/share