Skip to content

Commit 5951564

Browse files
committed
(FM-8922) - Add windows-2022 to customer workflows
Test framework does not rely on `extract_from_metadate_v2` so machin need's to be added manually.
1 parent 4976d0f commit 5951564

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

.github/workflows/nightly.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
if: ${{ github.repository_owner == 'puppetlabs' }}
5959
run: |
6060
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
61-
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'}]}"
61+
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'}]}"
6262
fi
6363
6464
- name: "Honeycomb: Record Setup Test Matrix time"

.github/workflows/pr_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
if: ${{ github.repository_owner == 'puppetlabs' }}
5858
run: |
5959
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
60-
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'}]}"
60+
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'}]}"
6161
fi
6262
6363
- name: "Honeycomb: Record Setup Test Matrix time"

spec/acceptance/compose_v3_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
file_extension = '.exe'
88
docker_args = 'docker_ee => true'
99
tmp_path = 'C:/cygwin64/tmp'
10-
test_container = if %r{2019}.match?(os[:release])
10+
test_container = if %r{2019|2022}}.match?(os[:release])
1111
'nanoserver'
1212
else
1313
'nanoserver-sac2016'

spec/acceptance/docker_full_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
if os[:kernel] == 'windows'
66
docker_args = 'docker_ee => true'
77
default_image = 'winamd64/hello-seattle'
8-
default_image_tag = if os[:release][:major] == '2019'
8+
default_image_tag = if os[:release][:major] == '2019' || os[:release][:major] == '2022'
99
'nanoserver'
1010
else
1111
'nanoserver-sac2016'

spec/acceptance/docker_params_changed_spec.rb

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
if os[:family] == 'windows'
66
os_name = run_shell('systeminfo | findstr /R /C:"OS Name"')
77
raise 'Could not retrieve systeminfo for Windows box' if os_name.exit_code != 0
8-
os_name = os_name.stdout.split(%r{\s}).include?('2016') ? 'win-2016' : 'win-2019'
8+
os_name = if os_name.stdout.split(%r{\s}).include?('2016')
9+
'win-2016'
10+
elsif os_name.stdout.split(%r{\s}).include?('2019')
11+
'win-2019'
12+
else
13+
'win-2022'
14+
end
915
docker_args = 'docker_ee => true'
1016
docker_network = 'nat'
1117
volume_location = 'C:\\'

spec/spec_helper_acceptance_local.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def fetch_puppet_version
174174
if os[:family] == 'windows'
175175
create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)
176176
create_remote_file(host, '/tmp/docker-stack.yml', docker_stack_content_windows)
177-
if %r{2019}.match?(os[:release])
177+
if %r{2019|2022}.match?(os[:release])
178178
create_remote_file(host, '/tmp/docker-compose-override-v3.yml', docker_compose_override_v3_windows)
179179
create_remote_file(host, '/tmp/docker-stack-override.yml', docker_stack_override_windows)
180180
else

0 commit comments

Comments
 (0)