Address reviewer comments:

- Change machines for libcxx from n2d-standard-64 to n2d-standard-32
- Change 'premerge-platform' to 'premerge-platform-libcxx', change
  'linux' to 'linux-libcxx' (update machine taints?)
- Remove extra libcxx runner yaml files and the extra libcxx images
  file; use variables and define libcxx images in the variables file.

Author: cmtice

premerge/gke_cluster/main.tf

@@ -79,12 +79,12 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
   node_config {
     machine_type = var.libcxx_machine_type
     taint {
-      key    = "premerge-platform"
-      value  = "linux"
+      key    = "premerge-platform-libcxx"
+      value  = "linux-libcxx"
       effect = "NO_SCHEDULE"
     }
     labels = {
-      "premerge-platform" : "linux"
+      "premerge-platform-libcxx" : "linux-libcxx"
     }
     disk_size_gb = 200
     # Terraform wants to recreate the node pool everytime whe running

premerge/libcxx_image_values.yaml

@@ -6,28 +6,21 @@ maxRunners: 8
 
 runnerGroup: ${ runner_group_name }
 
-- include_vars:
-    file: libcxx_image_values.yaml
-    name: images_dict
-- set_fact:
-    images: "{{ images:dict|dict2items(key_name='runner_set', value_name='image) }}"
-
 template:
   metadata:
     annotations:
       cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
   spec:
     tolerations:
-    - key: "premerge-platform"
+    - key: "premerge-platform-libcxx"
       operator: "Equal"
-      value: "linux"
+      value: "linux-libcxx"
       effect: "NoSchedule"
     nodeSelector:
-      premerge-platform: linux
+      premerge-platform-libcxx: linux
     containers:
     - name: runner
-      #image: ghcr.io/llvm/ci-ubuntu-24.04-agent:latest
-      image: images["libcxx-runner-set-current"]
+      image: ${ runner_image }
       command: ["/home/gha/actions-runner/run.sh"]
       resources:
         # If we don't set the CPU request high-enough here, 2 runners might

premerge/libcxx_next_runners_values.yaml

@@ -47,7 +47,7 @@ module "premerge_cluster_us_central" {
   source               = "./gke_cluster"
   cluster_name         = "llvm-premerge-cluster-us-central"
   region               = "us-central1-a"
-  libcxx_machine_type  = "n2-standard-64"
+  libcxx_machine_type  = "n2d-standard-32"
   linux_machine_type   = "n2-standard-64"
   windows_machine_type = "n2-standard-32"
 }
@@ -60,7 +60,7 @@ module "premerge_cluster_us_west" {
   source                      = "./gke_cluster"
   cluster_name                = "llvm-premerge-cluster-us-west"
   region                      = "us-west1"
-  libcxx_machine_type         = "n2d-standard-64"
+  libcxx_machine_type         = "n2d-standard-32"
   linux_machine_type          = "n2d-standard-64"
   windows_machine_type        = "n2d-standard-32"
   service_node_pool_locations = ["us-west1-a"]

premerge/libcxx_release_runners_values.yaml

@@ -137,7 +137,7 @@ resource "helm_release" "github_actions_runner_set_libcxx" {
   chart      = "gha-runner-scale-set"
 
   values = [
-    "${templatefile("libcxx_runners_values.yaml", { runner_group_name : var.runner_group_name })}"
+    "${templatefile("libcxx_runners_values.yaml", { runner_group_name : var.runner_group_name, runner_image : var.libcxx_runner_image })}"
   ]
 
   depends_on = [
@@ -155,7 +155,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_release" {
   chart      = "gha-runner-scale-set"
 
   values = [
-    "${templatefile("libcxx_release_runners_values.yaml", { runner_group_name : var.runner_group_name })}"
+    "${templatefile("libcxx_runners_values.yaml", { runner_group_name : var.runner_group_name, runner_image : var.libcxx_release_runner_image })}"
   ]
 
   depends_on = [
@@ -173,7 +173,7 @@ resource "helm_release" "github_actions_runner_set_libcxx_next" {
   chart      = "gha-runner-scale-set"
 
   values = [
-    "${templatefile("libcxx_next_runners_values.yaml", { runner_group_name : var.runner_group_name })}"
+    "${templatefile("libcxx_runners_values.yaml", { runner_group_name : var.runner_group_name, runner_image : var.libcxx_next_runner_image })}"
   ]
 
   depends_on = [

premerge/libcxx_runners_values.yaml

@@ -54,3 +54,18 @@ variable "externalservices_tempo_basicauth_username" {
 variable "runner_group_name" {
   type = string
 }
+
+variable "libcxx_runner_image" {
+  type = string
+  default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f51d8ca1dad84122ef73927c86512"
+}
+
+variable "libcxx_release_runner_image" {
+  type = string
+  default = "ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698"
+}
+
+variable "libcxx_next_runner_image" {
+  type = string
+  default = ""
+}