Continuing upgrade testing

sdarwin · sdarwin · commit 1fb8ccd1afca · 2025-08-11T17:04:37.000-06:00
diff --git a/examples/lambdas-download-cppal/.terraform.lock.hcl b/examples/lambdas-download-cppal/.terraform.lock.hcl
diff --git a/examples/lambdas-download-cppal/README-CPP.md b/examples/lambdas-download-cppal/README-CPP.md
@@ -1,5 +1,9 @@
+#!/bin/bash
+
+set -xe
 
 terraform init -upgrade
 terraform init
 # terraform apply -var=module_version=v3.3.0
-terraform apply -var=module_version=v3.4.2
+# terraform apply -var=module_version=v3.4.2
+terraform apply -var=module_version=v6.7.3
diff --git a/examples/lambdas-download-cppal/install.sh b/examples/lambdas-download-cppal/install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -xe
+
+terraform init -upgrade
+terraform init
+# terraform apply -var=module_version=v3.3.0
+# terraform apply -var=module_version=v3.4.2
+terraform apply -var=module_version=v6.7.3
diff --git a/examples/multi-runner-cppal/main.tf b/examples/multi-runner-cppal/main.tf
@@ -77,8 +77,8 @@ module "base" {
   aws_region = local.aws_region
 }
 
-# module "runners" {
-module "multi-runner" {
+module "runners" {
+# module "multi-runner" {
   source              = "../../modules/multi-runner"
   multi_runner_config = local.multi_runner_config
   #  Alternative to loading runner configuration from Yaml files is using static configuration:
@@ -157,14 +157,14 @@ module "multi-runner" {
   # }
 }
 
-# module "webhook_github_app" {
-#   source     = "../../modules/webhook-github-app"
-#   depends_on = [module.runners]
-# 
-#   github_app = {
-#     key_base64     = var.github_app.key_base64
-#     id             = var.github_app.id
-#     webhook_secret = random_id.random.hex
-#   }
-#   webhook_endpoint = module.runners.webhook.endpoint
-# }
+module "webhook_github_app" {
+  source     = "../../modules/webhook-github-app"
+  depends_on = [module.runners]
+
+  github_app = {
+    key_base64     = var.github_app.key_base64
+    id             = var.github_app.id
+    webhook_secret = random_id.random.hex
+  }
+  webhook_endpoint = module.runners.webhook.endpoint
+}
diff --git a/examples/multi-runner-cppal/outputs.tf b/examples/multi-runner-cppal/outputs.tf
@@ -1,6 +1,6 @@
 output "webhook_endpoint" {
-  # value = module.runners.webhook.endpoint
-  value = module.multi-runner.webhook.endpoint
+  value = module.runners.webhook.endpoint
+  # value = module.multi-runner.webhook.endpoint
 }
 
 output "webhook_secret" {
@@ -10,6 +10,6 @@ output "webhook_secret" {
 
 output "deprecated_variables_warning" {
   value = join("", [
-    module.multi-runner.deprecated_variables_warning,
+    module.runners.deprecated_variables_warning,
   ])
 }
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
@@ -28,8 +28,8 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202410151633'] }
+    owners: [ "254949769574" ]
+    filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202308022332'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml
@@ -28,8 +28,8 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202411261305'] }
+    owners: [ "254949769574" ]
+    filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202308022332'] }
   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
@@ -28,7 +28,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-focal-arm64-202508111835'] }
   block_device_mappings:
     - device_name: /dev/sda1
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml
@@ -28,7 +28,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-focal-amd64-202508112019'] }
   block_device_mappings:
     - device_name: /dev/sda1
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
@@ -29,7 +29,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202508112038'] }
   block_device_mappings:
     - device_name: /dev/sda1
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml
@@ -29,7 +29,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202508112038'] }
   block_device_mappings:
     - device_name: /dev/sda1
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
@@ -30,7 +30,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-noble-arm64-202508111958'] }
   block_device_mappings:
     - device_name: /dev/sda1
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml
@@ -30,7 +30,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami:
-    owners: [ "047402373783" ]
+    owners: [ "254949769574" ]
     filter: { 'name': ['github-runner-ubuntu-noble-amd64-202508111958'] }
   block_device_mappings:
     - device_name: /dev/sda1
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,8 +23,8 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
   ami:
-    owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2019-amd64-202508111835'], 'state': ["available"] }
+    owners: [ "254949769574" ]
+    filter: { 'name': ['github-runner-windows-2019-amd64-202508111835'], 'state': ["available"] }
   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
@@ -23,8 +23,9 @@ runner_config:
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
-  ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2022-amd64-202503112051'], 'state': ["available"] }
+  ami:
+    owners: [ "254949769574" ]
+    filter: { 'name': ['github-runner-windows-2022-amd64-202508111835'], 'state': ["available"] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2025.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2025.yaml
@@ -23,8 +23,9 @@ runner_config:
   delay_webhook_event: 0
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
-  ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2025-amd64-202504151722'], 'state': ["available"] }
+  ami:
+    owners: [ "254949769574" ]
+    filter: { 'name': ['github-runner-windows-2025-amd64-202508111835'], 'state': ["available"] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/scripts/dev_amis.sh b/scripts/dev_amis.sh
@@ -17,8 +17,8 @@ all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202508112038
 all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202508111958
 all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202508111958
 all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202508111835
-all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202503112049
-all_amis[windows-2025.yaml]=github-runner-windows-2025-amd64-202503112049
+all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202508111835
+all_amis[windows-2025.yaml]=github-runner-windows-2025-amd64-202508111835
 
 # Update the templates with the above values
 
diff --git a/scripts/modify_ami_owners.sh b/scripts/modify_ami_owners.sh
@@ -8,16 +8,19 @@ ami_account=047402373783
 # Test account, boost v2:
 ami_account=254949769574
 
-# imagestobuild="
-# ubuntu-bionic-arm64-cppal
-# ubuntu-bionic-cppal
-# ubuntu-focal-arm64-cppal
-# ubuntu-focal-cppal
-# ubuntu-jammy-arm64-cppal
-# ubuntu-jammy-cppal
-# windows-2019-cppal
-# 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
+windows-2025-cppal
+"
 
 timestamp=$(date +%Y%m%d_%H%M%S)
 cd ..

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`output "webhook_endpoint" {`
`2`		`- # value = module.runners.webhook.endpoint`
`3`		`- value = module.multi-runner.webhook.endpoint`
	`2`	`+ value = module.runners.webhook.endpoint`
	`3`	`+ # value = module.multi-runner.webhook.endpoint`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`output "webhook_secret" {`
`@@ -10,6 +10,6 @@ output "webhook_secret" {`
`10`	`10`
`11`	`11`	`output "deprecated_variables_warning" {`
`12`	`12`	`value = join("", [`
`13`		`- module.multi-runner.deprecated_variables_warning,`
	`13`	`+ module.runners.deprecated_variables_warning,`
`14`	`14`	`])`
`15`	`15`	`}`