2025-08 upgrade continued

sdarwin · sdarwin · commit fd7c1b7d605e · 2025-08-11T15:13:41.000-06:00
diff --git a/examples/multi-runner-cppal/main.tf b/examples/multi-runner-cppal/main.tf
@@ -77,7 +77,8 @@ module "base" {
   aws_region = local.aws_region
 }
 
-module "runners" {
+# 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:
@@ -156,14 +157,14 @@ module "runners" {
   # }
 }
 
-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/templates/runner-configs/ubuntu-focal-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml
@@ -29,7 +29,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-focal-arm64-202410151633'] }
+    filter: { 'name': ['github-runner-ubuntu-focal-arm64-202508111835'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml
@@ -29,7 +29,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-focal-amd64-202411261305'] }
+    filter: { 'name': ['github-runner-ubuntu-focal-amd64-202508112019'] }
   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
@@ -30,7 +30,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202410151633'] }
+    filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202508112038'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml
@@ -30,7 +30,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202411261305'] }
+    filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202508112038'] }
   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
@@ -31,7 +31,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-noble-arm64-202410151633'] }
+    filter: { 'name': ['github-runner-ubuntu-noble-arm64-202508111958'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-noble.yaml
@@ -31,7 +31,7 @@ runner_config:
   # userdata_template: ./templates/user-data.sh
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-ubuntu-noble-amd64-202411261305'] }
+    filter: { 'name': ['github-runner-ubuntu-noble-amd64-202508111958'] }
   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
@@ -24,7 +24,7 @@ runner_config:
   runner_boot_time_in_minutes: 20
   ami:
     owners: [ "047402373783" ]
-    filter: { 'name': ['github-runner-windows-2019-amd64-202503111933'] }
+    filter: { 'name': ['github-runner-windows-2019-amd64-202508111835'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/images/ubuntu-bionic-arm64-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-bionic-arm64-cppal/github_agent.ubuntu.pkr.hcl
@@ -131,7 +131,7 @@ source "amazon-ebs" "githubrunner" {
 
   source_ami_filter {
     filters = {
-      name                = "*/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-arm64-server-*"
+      name                = "*/ubuntu-bionic-18.04-arm64-server-*"
       root-device-type    = "ebs"
       virtualization-type = "hvm"
     }
diff --git a/images/ubuntu-focal-arm64-cppal/manifest.json b/images/ubuntu-focal-arm64-cppal/manifest.json
@@ -44,7 +44,16 @@
       "artifact_id": "us-west-2:ami-0e2ba4f8eb7b40f3c",
       "packer_run_uuid": "a3615f9b-83d7-97f3-1e88-888483a0e6b0",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754938373,
+      "files": null,
+      "artifact_id": "us-west-2:ami-048452a0425888c87",
+      "packer_run_uuid": "92a87052-8357-136b-663b-6290b64c6aee",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "a3615f9b-83d7-97f3-1e88-888483a0e6b0"
+  "last_run_uuid": "92a87052-8357-136b-663b-6290b64c6aee"
 }
diff --git a/images/ubuntu-focal-cppal/manifest.json b/images/ubuntu-focal-cppal/manifest.json
@@ -53,7 +53,16 @@
       "artifact_id": "us-west-2:ami-0b59d1579d6e77412",
       "packer_run_uuid": "678a6f4f-fc05-e008-0ffe-dd0bd26614c1",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754944683,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0e0f6bc3fbc6a8689",
+      "packer_run_uuid": "e3ff1db6-e342-996a-7159-cac11586d87b",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "678a6f4f-fc05-e008-0ffe-dd0bd26614c1"
+  "last_run_uuid": "e3ff1db6-e342-996a-7159-cac11586d87b"
 }
diff --git a/images/ubuntu-jammy-arm64-cppal/manifest.json b/images/ubuntu-jammy-arm64-cppal/manifest.json
@@ -44,7 +44,16 @@
       "artifact_id": "us-west-2:ami-03ec95da5522a4ede",
       "packer_run_uuid": "5efa90fe-4b75-4c6f-563a-e1d3878d8c8d",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754945645,
+      "files": null,
+      "artifact_id": "us-west-2:ami-050841a7c19e468f7",
+      "packer_run_uuid": "b0e4a710-e403-a9a2-4cfd-e32e624bc6f7",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "5efa90fe-4b75-4c6f-563a-e1d3878d8c8d"
+  "last_run_uuid": "b0e4a710-e403-a9a2-4cfd-e32e624bc6f7"
 }
diff --git a/images/ubuntu-jammy-cppal/manifest.json b/images/ubuntu-jammy-cppal/manifest.json
@@ -53,7 +53,16 @@
       "artifact_id": "us-west-2:ami-0984a51a7c985bc24",
       "packer_run_uuid": "22051816-02d5-20c7-b45a-0c744073653f",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754945773,
+      "files": null,
+      "artifact_id": "us-west-2:ami-05f0ef25a7f53172f",
+      "packer_run_uuid": "efe61626-3ebe-93c5-57d8-d7989c68e183",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "22051816-02d5-20c7-b45a-0c744073653f"
+  "last_run_uuid": "efe61626-3ebe-93c5-57d8-d7989c68e183"
 }
diff --git a/images/ubuntu-noble-arm64-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-noble-arm64-cppal/github_agent.ubuntu.pkr.hcl
@@ -131,7 +131,7 @@ source "amazon-ebs" "githubrunner" {
 
   source_ami_filter {
     filters = {
-      name                = "*/ubuntu/images/hvm-ssd/ubuntu-noble-24.04-arm64-server-*"
+      name                = "*/ubuntu-noble-24.04-arm64-server-*"
       root-device-type    = "ebs"
       virtualization-type = "hvm"
     }
diff --git a/images/ubuntu-noble-arm64-cppal/manifest.json b/images/ubuntu-noble-arm64-cppal/manifest.json
@@ -53,7 +53,16 @@
       "artifact_id": "us-west-2:ami-0577088e19057d9dc",
       "packer_run_uuid": "3fca5352-4adf-86fa-4e3e-1c8c8d2cd3e0",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754943106,
+      "files": null,
+      "artifact_id": "us-west-2:ami-056e76c38cdcc5536",
+      "packer_run_uuid": "cd3bf5e4-b0da-564c-2559-f4f1325739d5",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "3fca5352-4adf-86fa-4e3e-1c8c8d2cd3e0"
+  "last_run_uuid": "cd3bf5e4-b0da-564c-2559-f4f1325739d5"
 }
diff --git a/images/ubuntu-noble-cppal/github_agent.ubuntu.pkr.hcl b/images/ubuntu-noble-cppal/github_agent.ubuntu.pkr.hcl
@@ -131,7 +131,7 @@ source "amazon-ebs" "githubrunner" {
 
   source_ami_filter {
     filters = {
-      name                = "*/ubuntu/images/hvm-ssd/ubuntu-noble-24.04-amd64-server-*"
+      name                = "*/ubuntu-noble-24.04-amd64-server-*"
       root-device-type    = "ebs"
       virtualization-type = "hvm"
     }
diff --git a/images/ubuntu-noble-cppal/manifest.json b/images/ubuntu-noble-cppal/manifest.json
@@ -89,7 +89,16 @@
       "artifact_id": "us-west-2:ami-0b61a11f6d7cdb17c",
       "packer_run_uuid": "bd2609d4-3d39-7dd9-89a8-61f0d79af0bb",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754943282,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0441856c23809de6b",
+      "packer_run_uuid": "8484bf1b-a60d-3168-abfc-a24d13a1ed6f",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "bd2609d4-3d39-7dd9-89a8-61f0d79af0bb"
+  "last_run_uuid": "8484bf1b-a60d-3168-abfc-a24d13a1ed6f"
 }
diff --git a/images/windows-2019-cppal/manifest.json b/images/windows-2019-cppal/manifest.json
@@ -53,7 +53,16 @@
       "artifact_id": "us-west-2:ami-066933d4f3af15003",
       "packer_run_uuid": "9b83e34b-a8ab-fcd4-5d9b-b2213e165d46",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1754941414,
+      "files": null,
+      "artifact_id": "us-west-2:ami-09d0251efb17f50dd",
+      "packer_run_uuid": "d9daf178-f7bb-cf0e-86e1-607b8efea54a",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "9b83e34b-a8ab-fcd4-5d9b-b2213e165d46"
-}
+  "last_run_uuid": "d9daf178-f7bb-cf0e-86e1-607b8efea54a"
+}
diff --git a/scripts/dev_amis.sh b/scripts/dev_amis.sh
@@ -10,13 +10,13 @@ declare -A all_amis
 # all_amis - keep this line
 all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202308022332
 all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202308022332
-all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202308022332
-all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308022332
-all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308022332
-all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308022332
-all_amis[ubuntu-noble-arm64.yaml]=github-runner-ubuntu-noble-arm64-202404291834
-all_amis[ubuntu-noble.yaml]=github-runner-ubuntu-noble-amd64-202404291834
-all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202503111537
+all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202508111835
+all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202508112019
+all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202508112038
+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
 
diff --git a/scripts/packerimages.sh b/scripts/packerimages.sh
@@ -21,17 +21,8 @@ build_environment=dev
 # windows-2025-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
 "
 
 if [ "$build_environment" = "dev" ]; then

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ source "amazon-ebs" "githubrunner" {`
`131`	`131`
`132`	`132`	`source_ami_filter {`
`133`	`133`	`filters = {`
`134`		`- name = "/ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-arm64-server-"`
	`134`	`+ name = "/ubuntu-bionic-18.04-arm64-server-"`
`135`	`135`	`root-device-type = "ebs"`
`136`	`136`	`virtualization-type = "hvm"`
`137`	`137`	`}`