test(map): verify map.jinja dump using _mapdata state

* Semi-automated using myii/ssf-formula#271
myii · Oct 30, 2020 · 7358131 · 7358131
1 parent b865b22
commit 7358131
Show file tree

Hide file tree

Showing 30 changed files with 1,010 additions and 92 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -72,35 +72,81 @@ jobs:
     ## Define the rest of the matrix based on Kitchen testing
     # Make sure the instances listed below match up with
     # the `platforms` defined in `kitchen.yml`
+    # - env: INSTANCE=default-debian-10-tiamat-py3
+    # - env: INSTANCE=default-debian-9-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
+    # - env: INSTANCE=default-ubuntu-1604-tiamat-py3
+    # - env: INSTANCE=default-centos-8-tiamat-py3
+    # - env: INSTANCE=default-centos-7-tiamat-py3
+    # - 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-ubuntu-1604-master-py3
     # - env: INSTANCE=default-centos-8-master-py3
+    - env: INSTANCE=default-centos-7-master-py3
+    # - env: INSTANCE=default-fedora-33-master-py3
+    # - env: INSTANCE=default-fedora-32-master-py3
     # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=default-opensuse-leap-151-master-py3
-    # - env: INSTANCE=default-amazonlinux-2-master-py3
-    # - env: INSTANCE=default-debian-10-2019-2-py3
-    # - env: INSTANCE=default-debian-9-2019-2-py3
-    - env: INSTANCE=default-ubuntu-1804-2019-2-py3
-    # - env: INSTANCE=default-centos-8-2019-2-py3
-    # - env: INSTANCE=default-fedora-31-2019-2-py3
-    # - env: INSTANCE=default-opensuse-leap-151-2019-2-py3
-    # - env: INSTANCE=default-centos-7-2019-2-py2
-    - env: INSTANCE=default-amazonlinux-2-2019-2-py3
-    # - env: INSTANCE=default-arch-base-latest-2019-2-py2
-    # - env: INSTANCE=default-fedora-30-2018-3-py3
-    # - env: INSTANCE=default-debian-9-2018-3-py2
-    # - env: INSTANCE=default-ubuntu-1604-2018-3-py2
-    - env: INSTANCE=default-centos-7-2018-3-py2
-    - env: INSTANCE=default-opensuse-leap-151-2018-3-py2
-    # - env: INSTANCE=default-amazonlinux-1-2018-3-py2
-    # - env: INSTANCE=default-arch-base-latest-2018-3-py2
-    # - env: INSTANCE=default-debian-8-2017-7-py2
-    # - env: INSTANCE=default-ubuntu-1604-2017-7-py2
-    - env: INSTANCE=default-centos-6-2017-7-py2
-    # - env: INSTANCE=default-fedora-30-2017-7-py2
-    # - env: INSTANCE=default-opensuse-leap-151-2017-7-py2
-    # - env: INSTANCE=default-amazonlinux-1-2017-7-py2
-    # - env: INSTANCE=default-arch-base-latest-2017-7-py2
+    - env: INSTANCE=default-opensuse-leap-152-master-py3
+    - env: INSTANCE=default-amazonlinux-2-master-py3
+    # - env: INSTANCE=default-oraclelinux-8-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-master-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
+    # - env: INSTANCE=default-debian-10-3002-0-py3
+    # - env: INSTANCE=default-debian-9-3002-0-py3
+    # - env: INSTANCE=default-ubuntu-2004-3002-0-py3
+    # - env: INSTANCE=default-ubuntu-1804-3002-0-py3
+    # - env: INSTANCE=default-ubuntu-1604-3002-0-py3
+    # - env: INSTANCE=default-centos-8-3002-0-py3
+    # - env: INSTANCE=default-centos-7-3002-0-py3
+    # - env: INSTANCE=default-fedora-33-3002-0-py3
+    # - env: INSTANCE=default-fedora-32-3002-0-py3
+    # - env: INSTANCE=default-fedora-31-3002-0-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3002-0-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-0-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-0-py3
+    - env: INSTANCE=default-oraclelinux-7-3002-0-py3
+    # - env: INSTANCE=default-arch-base-latest-3002-0-py3
+    # - env: INSTANCE=default-debian-10-3001-1-py3
+    # - env: INSTANCE=default-debian-9-3001-1-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-1-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-1-py3
+    # - env: INSTANCE=default-ubuntu-1604-3001-1-py3
+    # - env: INSTANCE=default-centos-8-3001-1-py3
+    # - env: INSTANCE=default-centos-7-3001-1-py3
+    # - env: INSTANCE=default-fedora-33-3001-1-py3
+    # - env: INSTANCE=default-fedora-32-3001-1-py3
+    # - env: INSTANCE=default-fedora-31-3001-1-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-1-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-1-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-1-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-1-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-1-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-1-py3
+    # - env: INSTANCE=default-debian-10-3000-3-py3
+    # - env: INSTANCE=default-debian-9-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1604-3000-3-py3
+    # - env: INSTANCE=default-centos-8-3000-3-py3
+    # - env: INSTANCE=default-centos-7-3000-3-py3
+    # - env: INSTANCE=default-fedora-31-3000-3-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3000-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3000-3-py3
+    # - env: INSTANCE=default-oraclelinux-8-3000-3-py3
+    # - env: INSTANCE=default-oraclelinux-7-3000-3-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3000-3-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3000-3-py3
+    # - env: INSTANCE=default-ubuntu-1804-3000-3-py2
+    # - env: INSTANCE=default-ubuntu-1604-3000-3-py2
+    # - env: INSTANCE=default-centos-6-3000-3-py2
+    # - env: INSTANCE=default-amazonlinux-1-3000-3-py2
+    # - env: INSTANCE=default-arch-base-latest-3000-3-py2
 
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'

diff --git a/kitchen.github.yml b/kitchen.github.yml
@@ -13,8 +13,9 @@ platforms:
 provisioner:
   salt_install: bootstrap
   salt_bootstrap_options: -pythonVersion 3
-  init_environment: >
-    C:\salt\salt-call --local state.single file.managed
-    C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\openvpn.sls
-    source=https://github.com/saltstack/salt-winrepo-ng/raw/master/openvpn.sls
-    skip_verify=True makedirs=True; exit 0
+  init_environment: |
+    C:\salt\salt-call --local state.single file.managed `
+      C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\openvpn.sls `
+      source=https://github.com/saltstack/salt-winrepo-ng/raw/master/openvpn.sls `
+      skip_verify=True makedirs=True
+    exit 0
diff --git a/kitchen.vagrant.yml b/kitchen.vagrant.yml
@@ -11,8 +11,15 @@ platforms:
       gui: false
       linked_clone: true
     provisioner:
-      init_environment: >
-        salt-call --local state.single file.managed
-        C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\openvpn.sls
-        source=https://github.com/saltstack/salt-winrepo-ng/raw/master/openvpn.sls
-        skip_verify=True makedirs=True; exit 0
+      init_environment: |
+        # Workaround to allow `kitchen converge` to be used multiple times
+        # without having to `kitchen destroy` first: remove state files copied
+        # across during the previous `converge` (if present)
+        rm -recurse `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base `
+          -ErrorAction SilentlyContinue
+        salt-call --local state.single file.managed `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\openvpn.sls `
+          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/openvpn.sls `
+          skip_verify=True makedirs=True
+        exit 0