Increase size of some instances

sdarwin · sdarwin · commit f0c8c387a7f0 · 2025-08-11T11:33:06.000-06:00
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml
@@ -21,8 +21,8 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - t4g.large
-    - c6g.large
+    - t4g.xlarge
+    - c6g.xlarge
   runners_maximum_count: 50
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml
@@ -21,14 +21,14 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - m5ad.large
-    - m5a.large
+    - m5a.xlarge
+    - m5ad.xlarge
   runners_maximum_count: 50
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202410151633'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202411261305'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml
@@ -21,8 +21,8 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - t4g.large
-    - c6g.large
+    - t4g.xlarge
+    - c6g.xlarge
   runners_maximum_count: 50
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml
@@ -21,14 +21,14 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - m5ad.large
-    - m5a.large
+    - m5a.xlarge
+    - m5ad.xlarge
   runners_maximum_count: 200
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-focal-amd64-202410151633'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-focal-amd64-202411261305'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml
@@ -22,8 +22,8 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - t4g.large
-    - c6g.large
+    - t4g.xlarge
+    - c6g.xlarge
   runners_maximum_count: 50
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml
@@ -22,14 +22,14 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - m5ad.large
-    - m5a.large
+    - m5a.xlarge
+    - m5ad.xlarge
   runners_maximum_count: 200
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202410151633'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202411261305']}
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble-arm64.yaml
@@ -23,8 +23,8 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - t4g.large
-    - c6g.large
+    - t4g.xlarge
+    - c6g.xlarge
   runners_maximum_count: 50
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml
@@ -23,14 +23,14 @@ runner_config:
   enable_ssm_on_runners: true
   credit_specification: standard
   instance_types:
-    - m5ad.large
-    - m5a.large
+    - m5a.xlarge
+    - m5ad.xlarge
   runners_maximum_count: 200
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-noble-amd64-202410151633'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-noble-amd64-202411261305'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml
@@ -23,7 +23,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2019-amd64-202308172004'] }
+  ami_filter: { 'name': ['github-runner-windows-2019-amd64-202411261305'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml
@@ -24,7 +24,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2022-amd64-202409272156'] }
+  ami_filter: { 'name': ['github-runner-windows-2022-amd64-202411261305'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/images/ubuntu-bionic-cppal/manifest.json b/images/ubuntu-bionic-cppal/manifest.json
@@ -44,7 +44,16 @@
       "artifact_id": "us-west-2:ami-085aa9a953756d2ac",
       "packer_run_uuid": "48c72e49-0d23-ea50-c793-7c2cbae7477c",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1732627333,
+      "files": null,
+      "artifact_id": "us-west-2:ami-03b985943d7dda875",
+      "packer_run_uuid": "60bdd943-d322-b90f-4a2d-0dc18999056f",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "48c72e49-0d23-ea50-c793-7c2cbae7477c"
+  "last_run_uuid": "60bdd943-d322-b90f-4a2d-0dc18999056f"
 }
diff --git a/images/ubuntu-bionic-cppal/variables.auto.pkrvars.hcl b/images/ubuntu-bionic-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build .
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 root_volume_size_gb = 30
 ssh_keypair_name = "cppalliance-us-west-2-kp"
 ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
diff --git a/images/ubuntu-focal-cppal/manifest.json b/images/ubuntu-focal-cppal/manifest.json
@@ -44,7 +44,16 @@
       "artifact_id": "us-west-2:ami-06a5764bc858f04fc",
       "packer_run_uuid": "7659d26e-42f5-c9bd-03c3-171a793e2212",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1732628497,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0b59d1579d6e77412",
+      "packer_run_uuid": "678a6f4f-fc05-e008-0ffe-dd0bd26614c1",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "7659d26e-42f5-c9bd-03c3-171a793e2212"
+  "last_run_uuid": "678a6f4f-fc05-e008-0ffe-dd0bd26614c1"
 }
diff --git a/images/ubuntu-focal-cppal/variables.auto.pkrvars.hcl b/images/ubuntu-focal-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build .
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 root_volume_size_gb = 30
 custom_shell_commands = [
 "set -xe",
diff --git a/images/ubuntu-jammy-cppal/variables.auto.pkrvars.hcl b/images/ubuntu-jammy-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build .
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 tester1="$${PATH}"
 root_volume_size_gb = 30
 ssh_keypair_name = "cppalliance-us-west-2-kp"
diff --git a/images/ubuntu-noble-cppal/manifest.json b/images/ubuntu-noble-cppal/manifest.json
@@ -80,7 +80,16 @@
       "artifact_id": "us-west-2:ami-01a9a23e6a127b282",
       "packer_run_uuid": "e78d7b62-d6b8-1b8a-c665-bf87170a209d",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1732627039,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0b61a11f6d7cdb17c",
+      "packer_run_uuid": "bd2609d4-3d39-7dd9-89a8-61f0d79af0bb",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "e78d7b62-d6b8-1b8a-c665-bf87170a209d"
+  "last_run_uuid": "bd2609d4-3d39-7dd9-89a8-61f0d79af0bb"
 }
diff --git a/images/ubuntu-noble-cppal/variables.auto.pkrvars.hcl b/images/ubuntu-noble-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build .
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 tester1="$${PATH}"
 root_volume_size_gb = 30
 ssh_keypair_name = "cppalliance-us-west-2-kp"
diff --git a/images/windows-2019-cppal/manifest.json b/images/windows-2019-cppal/manifest.json
@@ -44,7 +44,16 @@
       "artifact_id": "us-west-2:ami-0ae0b9b5a5397b564",
       "packer_run_uuid": "92feb7c1-a775-ec44-90f7-b51acd12bc68",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1732630382,
+      "files": null,
+      "artifact_id": "us-west-2:ami-066933d4f3af15003",
+      "packer_run_uuid": "9b83e34b-a8ab-fcd4-5d9b-b2213e165d46",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "92feb7c1-a775-ec44-90f7-b51acd12bc68"
+  "last_run_uuid": "9b83e34b-a8ab-fcd4-5d9b-b2213e165d46"
 }
diff --git a/images/windows-2019-cppal/variables.auto.pkrvars.hcl b/images/windows-2019-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build . | tee output.out 2>&1
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 # 2019 set to 70GB. 2022 60GB, for now.
 root_volume_size_gb = 70
 ssh_keypair_name = "cppalliance-us-west-2-kp"
diff --git a/images/windows-2022-cppal/github_agent.windows.pkr.hcl b/images/windows-2022-cppal/github_agent.windows.pkr.hcl
@@ -7,6 +7,11 @@ packer {
   }
 }
 
+aws_polling {
+  delay_seconds = 60
+  max_attempts  = 120
+}
+
 variable "ssh_keypair_name" {
   description = "SSH keypair name"
   type        = string
diff --git a/images/windows-2022-cppal/variables.auto.pkrvars.hcl b/images/windows-2022-cppal/variables.auto.pkrvars.hcl
@@ -5,7 +5,8 @@
 # or
 # packer build . | tee output.out 2>&1
 region = "us-west-2"
-instance_type = "t2.xlarge"
+# instance_type = "t2.xlarge"
+instance_type = "m5a.xlarge"
 # 2024-09 size was 70. Add 10 for the jobs, and 10 for the pagefile.
 # then another 10 for the pagefile.
 root_volume_size_gb = 100
diff --git a/scripts/packerimages.sh b/scripts/packerimages.sh
@@ -20,14 +20,12 @@ build_environment=prod
 # windows-2022-cppal
 
 imagestobuild="
-ubuntu-bionic-arm64-cppal
 ubuntu-bionic-cppal
-ubuntu-focal-arm64-cppal
 ubuntu-focal-cppal
-ubuntu-jammy-arm64-cppal
 ubuntu-jammy-cppal
-ubuntu-noble-arm64-cppal
 ubuntu-noble-cppal
+windows-2019-cppal
+windows-2022-cppal
 "
 
 if [ "$build_environment" = "dev" ]; then
diff --git a/scripts/prod_amis.sh b/scripts/prod_amis.sh
@@ -8,16 +8,16 @@ set -xe
 declare -A all_amis
 
 # all_amis - keep this line
-all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202410151633
+all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202411261305
 all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202410151633
 all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202410151633
-all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202410151633
-all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202410151633
+all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202411261305
+all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202411261305
 all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202410151633
-all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202410151633
+all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202411261305
 all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202410151633
-all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308172004
-all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202409272156
+all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202411261305
+all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202411261305
 
 # Update the templates with the above values
 
diff --git a/scripts/prod_amis.sh.bck b/scripts/prod_amis.sh.bck
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# A script to both keep track of the latest ami labels when they change,
+# and also to reset the names to their correct values later.
+
+set -xe
+
+declare -A all_amis
+
+# all_amis - keep this line
+all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202410151633
+all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202410151633
+all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202410151633
+all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202410151633
+all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202410151633
+all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202410151633
+all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202410151633
+all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202410151633
+all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308172004
+all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202409272156
+
+# Update the templates with the above values
+
+cd ..
+mainfolder=$(pwd)
+runnertemplatefolder="${mainfolder}/examples/multi-runner-cppal/templates/runner-configs"
+cd ${runnertemplatefolder}
+for runnertemplate in "${!all_amis[@]}"; do
+    ami_name="${all_amis[$runnertemplate]}"
+    newline="ami_filter: { 'name': ['${ami_name}'] }"
+    sed -i "s/ami_filter:.*/$newline/g" ${runnertemplatefolder}/${runnertemplate}
+done
