Merge pull request #801 from puppetlabs/pdksync_FM-8922/main/add_windows_2022_support

pdksync - (FM-8922) - Add Support for Windows 2022

Author: LukasAud

.github/workflows/nightly.yml

@@ -58,7 +58,7 @@ jobs:
         if: ${{ github.repository_owner == 'puppetlabs' }}
         run: |
           if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-            echo  "::set-output name=matrix::{'collection':['puppet6-nightly','puppet7-nightly'],'platforms':[{'label':'Windows 2016','provider':'provision::provision_service','image':'windows-2016'},{'label':'Windows 2019','provider':'provision::provision_service','image':'windows-2019-core'}]}"
+            echo  "::set-output name=matrix::{'collection':['puppet6-nightly','puppet7-nightly'],'platforms':[{'label':'Windows 2016','provider':'provision::provision_service','image':'windows-2016'},{'label':'Windows 2019','provider':'provision::provision_service','image':'windows-2019-core'},{'label':'Windows 2022','provider':'provision::provision_service','image':'windows-2022'}]}"
           fi
 
       - name: "Honeycomb: Record Setup Test Matrix time"

.github/workflows/pr_test.yaml

@@ -57,7 +57,7 @@ jobs:
         if: ${{ github.repository_owner == 'puppetlabs' }}
         run: |
           if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
-            echo  "::set-output name=matrix::{'collection':['puppet6-nightly','puppet7-nightly'],'platforms':[{'label':'Windows 2016','provider':'provision::provision_service','image':'windows-2016'},{'label':'Windows 2019','provider':'provision::provision_service','image':'windows-2019-core'}]}"
+            echo  "::set-output name=matrix::{'collection':['puppet6-nightly','puppet7-nightly'],'platforms':[{'label':'Windows 2016','provider':'provision::provision_service','image':'windows-2016'},{'label':'Windows 2019','provider':'provision::provision_service','image':'windows-2019-core'},{'label':'Windows 2022','provider':'provision::provision_service','image':'windows-2022'}]}"
           fi
 
       - name: "Honeycomb: Record Setup Test Matrix time"

metadata.json

@@ -53,7 +53,8 @@
       "operatingsystem": "Windows",
       "operatingsystemrelease": [
         "2016",
-        "2019"
+        "2019",
+        "2022"
       ]
     }
   ],

spec/acceptance/compose_v3_spec.rb

@@ -7,7 +7,7 @@
   file_extension = '.exe'
   docker_args = 'docker_ee => true'
   tmp_path = 'C:/cygwin64/tmp'
-  test_container = if %r{2019}.match?(os[:release])
+  test_container = if %r{2019|2022}.match?(os[:release])
                      'nanoserver'
                    else
                      'nanoserver-sac2016'

spec/acceptance/docker_full_spec.rb

@@ -5,7 +5,7 @@
 if os[:kernel] == 'windows'
   docker_args = 'docker_ee => true'
   default_image = 'winamd64/hello-seattle'
-  default_image_tag = if os[:release][:major] == '2019'
+  default_image_tag = if os[:release][:major] == '2019' || os[:release][:major] == '2022'
                         'nanoserver'
                       else
                         'nanoserver-sac2016'

spec/acceptance/docker_params_changed_spec.rb

@@ -5,7 +5,13 @@
 if os[:family] == 'windows'
   os_name = run_shell('systeminfo | findstr /R /C:"OS Name"')
   raise 'Could not retrieve systeminfo for Windows box' if os_name.exit_code != 0
-  os_name = os_name.stdout.split(%r{\s}).include?('2016') ? 'win-2016' : 'win-2019'
+  os_name = if os_name.stdout.split(%r{\s}).include?('2016')
+              'win-2016'
+            elsif os_name.stdout.split(%r{\s}).include?('2019')
+              'win-2019'
+            else
+              'win-2022'
+            end
   docker_args = 'docker_ee => true'
   docker_network = 'nat'
   volume_location = 'C:\\'

spec/spec_helper_acceptance_local.rb

@@ -174,7 +174,7 @@ def fetch_puppet_version
     if os[:family] == 'windows'
       create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)
       create_remote_file(host, '/tmp/docker-stack.yml', docker_stack_content_windows)
-      if %r{2019}.match?(os[:release])
+      if %r{2019|2022}.match?(os[:release])
         create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_compose_override_v3_windows)
         create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows)
       else