Skip to content

Commit e6bbe67

Browse files
sdarwinsdarwin
committed
Resize Win2019. Remove packages Win2022.
1 parent 38252f6 commit e6bbe67

File tree

8 files changed

+61
-14
lines changed

8 files changed

+61
-14
lines changed

‎examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ runner_config:
2323
scale_down_schedule_expression: cron(* * * * ? *)
2424
runner_boot_time_in_minutes: 20
2525
ami_owners: [ "047402373783" ]
26-
ami_filter: { 'name': ['github-runner-windows-2019-amd64-202308161544'] }
26+
ami_filter: { 'name': ['github-runner-windows-2019-amd64-202308172004'] }
2727
block_device_mappings:
2828
- device_name: /dev/sda1
2929
delete_on_termination: true
3030
volume_type: gp3
31-
volume_size: 60
31+
volume_size: 70
3232
encrypted: true
3333
iops: null
3434
throughput: null

‎examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ runner_config:
2424
scale_down_schedule_expression: cron(* * * * ? *)
2525
runner_boot_time_in_minutes: 20
2626
ami_owners: [ "047402373783" ]
27-
ami_filter: { 'name': ['github-runner-windows-2022-amd64-202308161544'] }
27+
ami_filter: { 'name': ['github-runner-windows-2022-amd64-202308171527'] }
2828
block_device_mappings:
2929
- device_name: /dev/sda1
3030
delete_on_termination: true

‎images/windows-2019-cppal/manifest.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,16 @@
3535
"artifact_id": "us-west-2:ami-0841a945303463903",
3636
"packer_run_uuid": "b680b1cb-82d5-c624-9bab-4a0a35a563e9",
3737
"custom_data": null
38+
},
39+
{
40+
"name": "githubrunner",
41+
"builder_type": "amazon-ebs",
42+
"build_time": 1692307103,
43+
"files": null,
44+
"artifact_id": "us-west-2:ami-0ae0b9b5a5397b564",
45+
"packer_run_uuid": "92feb7c1-a775-ec44-90f7-b51acd12bc68",
46+
"custom_data": null
3847
}
3948
],
40-
"last_run_uuid": "b680b1cb-82d5-c624-9bab-4a0a35a563e9"
49+
"last_run_uuid": "92feb7c1-a775-ec44-90f7-b51acd12bc68"
4150
}

‎images/windows-2019-cppal/variables.auto.pkrvars.hcl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
# packer build . | tee output.out 2>&1
77
region = "us-west-2"
88
instance_type = "t2.xlarge"
9-
root_volume_size_gb = 60
9+
# 2019 set to 70GB. 2022 60GB, for now.
10+
root_volume_size_gb = 70
1011
ssh_keypair_name = "cppalliance-us-west-2-kp"
1112
ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
1213

‎images/windows-2022-cppal/manifest.json

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,43 @@
2626
"artifact_id": "us-west-2:ami-029863b793a310918",
2727
"packer_run_uuid": "76e2992b-3db9-be5f-1cb5-640aa3466534",
2828
"custom_data": null
29+
},
30+
{
31+
"name": "githubrunner",
32+
"builder_type": "amazon-ebs",
33+
"build_time": 1692279443,
34+
"files": null,
35+
"artifact_id": "us-west-2:ami-0c7a489e7f048f53e",
36+
"packer_run_uuid": "18a172db-53c5-6b62-7ec8-e7f109cb0327",
37+
"custom_data": null
38+
},
39+
{
40+
"name": "githubrunner",
41+
"builder_type": "amazon-ebs",
42+
"build_time": 1692282535,
43+
"files": null,
44+
"artifact_id": "us-west-2:ami-0426bd562cd051f30",
45+
"packer_run_uuid": "370972da-1f46-5f29-9bde-3c6543b01442",
46+
"custom_data": null
47+
},
48+
{
49+
"name": "githubrunner",
50+
"builder_type": "amazon-ebs",
51+
"build_time": 1692285425,
52+
"files": null,
53+
"artifact_id": "us-west-2:ami-01fa5982bda798944",
54+
"packer_run_uuid": "f62fe9f2-6498-754a-3384-9f76d87bce9d",
55+
"custom_data": null
56+
},
57+
{
58+
"name": "githubrunner",
59+
"builder_type": "amazon-ebs",
60+
"build_time": 1692288870,
61+
"files": null,
62+
"artifact_id": "us-west-2:ami-0c09b40136606c789",
63+
"packer_run_uuid": "d6ce02cd-07e0-eddb-6060-11ac94116742",
64+
"custom_data": null
2965
}
3066
],
31-
"last_run_uuid": "76e2992b-3db9-be5f-1cb5-640aa3466534"
67+
"last_run_uuid": "d6ce02cd-07e0-eddb-6060-11ac94116742"
3268
}

‎images/windows-2022-cppal/variables.auto.pkrvars.hcl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ custom_shell_commands = [
1818
"# automatic",
1919
"# choco install -y visualstudio2017buildtools --version 15.9.54.0",
2020
"# Installing visualstudio2019 on the same image as 2022. Recommended to install in chronological order",
21-
"choco install -y visualstudio2019buildtools",
22-
"choco install visualstudio2019-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
23-
"choco install -y visualstudio2022buildtools --version 117.5.5.0",
21+
"# Note 2023-08-17: visualstudio2019buildtools and visualstudio2019-workload-vctools no longer appear to be compatible",
22+
"# with visualstudio2022buildtools and visualstudio2019-workload-vctools. Warnings and errors. Commenting out:",
23+
"# choco install -y visualstudio2019buildtools",
24+
"# choco install visualstudio2019-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
25+
"choco install -y visualstudio2022buildtools --version 117.6.5.0",
2426
"choco install -y 7zip.install --version 22.1",
2527
"# automatic",
2628
"# choco install -y chocolatey --version 1.31",
@@ -62,7 +64,7 @@ custom_shell_commands = [
6264
"# choco install -y vcredist140 --version 14.34.31938",
6365
"# choco install -y vcredist2015 --version 14.0.24215.20170201",
6466
"choco install -y vcredist2017 --version 14.16.27033",
65-
"choco install -y visualstudio-installer --version 2.0.3",
67+
"# already being installed: choco install -y visualstudio-installer --version 2.0.3",
6668
"# CHECK. DO THESE EXIST? ARE THEY PRESENT NOW?",
6769
"# choco install -y visualstudio2022-workload-netcorebuildtools # doesn't exist",
6870
"# choco install -y visualstudio2022-workload-vctools --version 1.0.0 # see below",
@@ -78,7 +80,7 @@ custom_shell_commands = [
7880
"echo Adding visualstudio2022",
7981
"# visualstudio2022-workload-vctools failed last time. Add a sleep command.",
8082
"Start-Sleep -Seconds 10",
81-
"choco install visualstudio2022-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
83+
"choco upgrade visualstudio2022-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
8284
"$${oldpath} = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).path",
8385
"$${newpath} = \"C:\\Git\\usr\\bin;$${oldpath}\"",
8486
"Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH -Value $${newPath}",

‎scripts/packerimages.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ build_environment=prod
1919

2020
imagestobuild="
2121
windows-2019-cppal
22-
windows-2022-cppal
2322
"
2423

2524
if [ "$build_environment" = "dev" ]; then

‎scripts/prod_amis.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202308031506
1313
all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308031506
1414
all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308031506
1515
all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308031506
16-
all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308161544
17-
all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202308161544
16+
all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308172004
17+
all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202308171527
1818

1919
# Update the templates with the above values
2020

0 commit comments

Comments
 (0)