From 0bbe68619fdf3791e6202ce3f17ca03efc4441c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Tue, 23 Mar 2021 11:24:29 +0000
Subject: [PATCH] ci(kitchen+ci): include `passenger` suite [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/303
---
 .gitlab-ci.yml                        | 38 ++++++++++++++++++++++-----
 .travis.yml                           | 38 ++++++++++++++++++++++-----
 .yamllint                             |  3 ++-
 kitchen.yml                           | 24 +++++++++++++++++
 test/integration/passenger/inspec.yml | 11 +++++++-
 5 files changed, 98 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e18d4bf..67978ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,22 +133,45 @@ rubocop:
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
-default-debian-10-master-py3: {extends: '.test_instance'}
-default-debian-9-master-py3: {extends: '.test_instance'}
-default-ubuntu-2004-master-py3: {extends: '.test_instance'}
-default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# default-debian-10-master-py3: {extends: '.test_instance'}
+# passenger-debian-10-master-py3: {extends: '.test_instance'}
+debian-10-master-py3: {extends: '.test_instance'}
+# default-debian-9-master-py3: {extends: '.test_instance'}
+# passenger-debian-9-master-py3: {extends: '.test_instance'}
+debian-9-master-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
+# passenger-ubuntu-2004-master-py3: {extends: '.test_instance'}
+ubuntu-2004-master-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
+# passenger-ubuntu-1804-master-py3: {extends: '.test_instance'}
+ubuntu-1804-master-py3: {extends: '.test_instance'}
 default-ubuntu-1604-master-py3: {extends: '.test_instance'}
-default-centos-8-master-py3: {extends: '.test_instance'}
-default-centos-7-master-py3: {extends: '.test_instance'}
+# ubuntu-1604-master-py3: {extends: '.test_instance'}
+# default-centos-8-master-py3: {extends: '.test_instance'}
+# passenger-centos-8-master-py3: {extends: '.test_instance'}
+centos-8-master-py3: {extends: '.test_instance'}
+# default-centos-7-master-py3: {extends: '.test_instance'}
+# passenger-centos-7-master-py3: {extends: '.test_instance'}
+centos-7-master-py3: {extends: '.test_instance'}
 default-fedora-33-master-py3: {extends: '.test_instance'}
+# fedora-33-master-py3: {extends: '.test_instance'}
 default-fedora-32-master-py3: {extends: '.test_instance'}
+# fedora-32-master-py3: {extends: '.test_instance'}
 default-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'}
+# opensuse-tmbl-latest-master-py3: {extends: '.test_instance'}
 default-amazonlinux-2-master-py3: {extends: '.test_instance'}
-default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# amazonlinux-2-master-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-master-py3: {extends: '.test_instance'}
+# passenger-oraclelinux-8-master-py3: {extends: '.test_instance'}
+oraclelinux-8-master-py3: {extends: '.test_instance'}
 default-oraclelinux-7-master-py3: {extends: '.test_instance'}
+# oraclelinux-7-master-py3: {extends: '.test_instance'}
 # default-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'}
+# gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-debian-10-3002-5-py3: {extends: '.test_instance'}
 # default-debian-9-3002-5-py3: {extends: '.test_instance'}
 # default-ubuntu-2004-3002-5-py3: {extends: '.test_instance'}
@@ -162,6 +185,7 @@ default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-3002-5-py3: {extends: '.test_instance'}
 # default-oraclelinux-7-3002-5-py3: {extends: '.test_instance'}
 default-arch-base-latest-3002-5-py3: {extends: '.test_instance'}
+# arch-base-latest-3002-5-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-latest-3002-5-py3: {extends: '.test_instance'}
 # default-gentoo-stage3-systemd-3002-5-py3: {extends: '.test_instance'}
 # default-opensuse-leap-152-3002-2-py3: {extends: '.test_instance'}
diff --git a/.travis.yml b/.travis.yml
index b33ce7b..905a129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,22 +104,45 @@ jobs:
     # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
     # - env: INSTANCE=default-oraclelinux-7-tiamat-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-debian-10-master-py3
+    # - env: INSTANCE=passenger-debian-10-master-py3
+    - env: INSTANCE=debian-10-master-py3
+    # - env: INSTANCE=default-debian-9-master-py3
+    # - env: INSTANCE=passenger-debian-9-master-py3
+    - env: INSTANCE=debian-9-master-py3
+    # - env: INSTANCE=default-ubuntu-2004-master-py3
+    # - env: INSTANCE=passenger-ubuntu-2004-master-py3
+    - env: INSTANCE=ubuntu-2004-master-py3
+    # - env: INSTANCE=default-ubuntu-1804-master-py3
+    # - env: INSTANCE=passenger-ubuntu-1804-master-py3
+    - env: INSTANCE=ubuntu-1804-master-py3
     - env: INSTANCE=default-ubuntu-1604-master-py3
-    - env: INSTANCE=default-centos-8-master-py3
-    - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=ubuntu-1604-master-py3
+    # - env: INSTANCE=default-centos-8-master-py3
+    # - env: INSTANCE=passenger-centos-8-master-py3
+    - env: INSTANCE=centos-8-master-py3
+    # - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=passenger-centos-7-master-py3
+    - env: INSTANCE=centos-7-master-py3
     - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=fedora-33-master-py3
     - env: INSTANCE=default-fedora-32-master-py3
+    # - env: INSTANCE=fedora-32-master-py3
     - env: INSTANCE=default-opensuse-leap-152-master-py3
+    # - env: INSTANCE=opensuse-leap-152-master-py3
     - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
+    # - env: INSTANCE=opensuse-tmbl-latest-master-py3
     - env: INSTANCE=default-amazonlinux-2-master-py3
-    - env: INSTANCE=default-oraclelinux-8-master-py3
+    # - env: INSTANCE=amazonlinux-2-master-py3
+    # - env: INSTANCE=default-oraclelinux-8-master-py3
+    # - env: INSTANCE=passenger-oraclelinux-8-master-py3
+    - env: INSTANCE=oraclelinux-8-master-py3
     - env: INSTANCE=default-oraclelinux-7-master-py3
+    # - env: INSTANCE=oraclelinux-7-master-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    # - env: INSTANCE=gentoo-stage3-latest-master-py3
     - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=gentoo-stage3-systemd-master-py3
     # - env: INSTANCE=default-debian-10-3002-5-py3
     # - env: INSTANCE=default-debian-9-3002-5-py3
     # - env: INSTANCE=default-ubuntu-2004-3002-5-py3
@@ -133,6 +156,7 @@ jobs:
     # - env: INSTANCE=default-oraclelinux-8-3002-5-py3
     # - env: INSTANCE=default-oraclelinux-7-3002-5-py3
     - env: INSTANCE=default-arch-base-latest-3002-5-py3
+    # - env: INSTANCE=arch-base-latest-3002-5-py3
     # - env: INSTANCE=default-gentoo-stage3-latest-3002-5-py3
     # - env: INSTANCE=default-gentoo-stage3-systemd-3002-5-py3
     # - env: INSTANCE=default-opensuse-leap-152-3002-2-py3
diff --git a/.yamllint b/.yamllint
index 73d532d..ab8dba2 100644
--- a/.yamllint
+++ b/.yamllint
@@ -14,8 +14,9 @@ ignore: |
   .cache/
   .git/
   node_modules/
-  test/salt/**/*.sls
+  test/**/states/**/*.sls
   .kitchen/
+  test/salt/passenger/pillar/nginx.sls
 
 yaml-files:
   # Default settings
diff --git a/kitchen.yml b/kitchen.yml
index f736542..a007d39 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -323,3 +323,27 @@ suites:
     verifier:
       inspec_tests:
         - path: test/integration/default
+  - name: passenger
+    includes:
+      - debian-10-master-py3
+      - debian-9-master-py3
+      - ubuntu-2004-master-py3
+      - ubuntu-1804-master-py3
+      - centos-8-master-py3
+      - centos-7-master-py3
+      - oraclelinux-8-master-py3
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - nginx.passenger
+      pillars:
+        top.sls:
+          base:
+            '*':
+              - nginx
+      pillars_from_files:
+        nginx.sls: test/salt/passenger/pillar/nginx.sls
+    verifier:
+      inspec_tests:
+        - path: test/integration/passenger
diff --git a/test/integration/passenger/inspec.yml b/test/integration/passenger/inspec.yml
index 08c695d..e42a794 100644
--- a/test/integration/passenger/inspec.yml
+++ b/test/integration/passenger/inspec.yml
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-name: default
+name: passenger
 title: nginx formula
 maintainer: SaltStack Formulas
 license: Apache-2.0
@@ -10,3 +10,12 @@ supports:
   - platform-name: debian
   - platform-name: ubuntu
   - platform-name: centos
+  - platform-name: fedora
+  - platform-name: opensuse
+  - platform-name: suse
+  - platform-name: freebsd
+  - platform-name: amazon
+  - platform-name: oracle
+  - platform-name: arch
+  - platform-name: gentoo
+  - platform: windows