0.5.1 Fixing the CI. No Chef Code Changes

snohio · Nov 29, 2023 · b7ea5ac · b7ea5ac
1 parent 6f167e1
commit b7ea5ac
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 56 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,6 +56,18 @@
             CHEF_LICENSE: accept-no-persist
             KITCHEN_LOCAL_YAML: kitchen.azure.yml
             AZURE_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }}
+            AZURE_TAGS: ${{ vars.AZURE_TAGS }}
+        - name: Test-Kitchen Converge Again
+          uses: actionshub/test-kitchen@main
+          with:
+            suite: ${{ matrix.suite }}
+            os: ${{ matrix.os }}
+            action: converge
+          env:
+            CHEF_LICENSE: accept-no-persist
+            KITCHEN_LOCAL_YAML: kitchen.azure.yml
+            AZURE_SUBSCRIPTION_ID: ${{ secrets.SUBSCRIPTION_ID }}
+            AZURE_TAGS: ${{ vars.AZURE_TAGS }}
         - name: Test-Kitchen Verify
           uses: actionshub/test-kitchen@main
           with:

diff --git a/kitchen.azure.yml b/kitchen.azure.yml
@@ -5,8 +5,7 @@ driver:
   location: 'East US'
   machine_size: 'Standard_D2s_v3'
   azure_resource_group_prefix: 'ga-win_choco-'
-  resource_group_tags:
-   X-TTL: '2'
+  resource_group_tags: <%= ENV["AZURE_TAGS"] %>
 
 provisioner:
   name: chef_infra

diff --git a/kitchen.yml b/kitchen.yml
@@ -1,54 +1,54 @@
----
-driver:
-  name: vagrant
-  box_auto_update: true
-  box_auto_prune: true
-
-provisioner:
-  name: chef_zero
-  always_update_cookbooks: true
-  product_name: chef
-  product_version: 17.8
-  channel: stable
-
-### Uncomment this setting to have Test Kitchen fail on any deprecation warning; useful in advance of a new chef-client release
-  # deprecations_as_errors: true
-
-verifier:
-  name: inspec
-
-platforms:
-
-- name: almalinux-8.5
-  driver:
-    linked_clone: true
-  customize:
-    cpus: 2
-    memory: 2048
-
-- name: stromweld/windows-2022
-  os_type: windows
-  transport:
-    name: winrm
-    elevated: true
-    elevated_username: vagrant
-    elevated_password: vagrant
-  driver:
-    box_name: windows-2022
-    customize:
-      cpus: 2
-      memory: 2048
-
-
-suites:
-  - name: default
-    run_list:
-      - recipe[chef-client::default]
-    verifier:
-      inspec_tests:
-        - compliance/profiles/client-run/controls
-    attributes:
-      audit:
-        reporter: 'cli'
-#      chef:
-#        filepath: = 'c:\Users\vagrant\AppData\Local\Temp\kitchen\client.pem'
+---
+driver:
+  name: vagrant
+  box_auto_update: true
+  box_auto_prune: true
+
+provisioner:
+  name: chef_zero
+  always_update_cookbooks: true
+  product_name: chef
+  product_version: 17.8
+  channel: stable
+
+### Uncomment this setting to have Test Kitchen fail on any deprecation warning; useful in advance of a new chef-client release
+  # deprecations_as_errors: true
+
+verifier:
+  name: inspec
+
+platforms:
+
+- name: almalinux-8.5
+  driver:
+    linked_clone: true
+  customize:
+    cpus: 2
+    memory: 2048
+
+- name: stromweld/windows-2022
+  os_type: windows
+  transport:
+    name: winrm
+    elevated: true
+    elevated_username: vagrant
+    elevated_password: vagrant
+  driver:
+    box_name: windows-2022
+    customize:
+      cpus: 2
+      memory: 2048
+
+
+suites:
+  - name: default
+    run_list:
+      - recipe[chef-client::default]
+    verifier:
+      inspec_tests:
+        - compliance/profiles/client-run/controls
+    attributes:
+      audit:
+        reporter: 'cli'
+#      chef:
+#        filepath: = 'c:\Users\vagrant\AppData\Local\Temp\kitchen\client.pem'