Skip to content

[CI] Specify CPU Microarchitectue for Premerge Worker Nodes #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boomanaiden154 merged 2 commits into from
Nov 24, 2025
Merged

[CI] Specify CPU Microarchitectue for Premerge Worker Nodes #663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca638e3
[CI] Specify CPU Microarchitectue for Premerge Worker Nodes
boomanaiden154 Nov 20, 2025
dfaf312
format
boomanaiden154 Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions premerge/gke_cluster/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ resource "google_container_cluster" "llvm_premerge" {
}
}

variable "microarchitecture_map" {
type = map(string)
default = {
"n2d" : "AMD Milan"
"n2-" : "Intel Ice Lake"
}
}

resource "google_container_node_pool" "llvm_premerge_linux_service" {
name = "llvm-premerge-linux-service"
location = var.region
Expand Down Expand Up @@ -62,7 +70,8 @@ resource "google_container_node_pool" "llvm_premerge_linux" {
}

node_config {
machine_type = var.linux_machine_type
machine_type = var.linux_machine_type
min_cpu_platform = var.microarchitecture_map[substr(var.linux_machine_type, 0, 3)]
taint {
key = "premerge-platform"
value = "linux"
Expand Down Expand Up @@ -96,7 +105,8 @@ resource "google_container_node_pool" "llvm_buildbot_linux" {
}

node_config {
machine_type = var.linux_machine_type
machine_type = var.linux_machine_type
min_cpu_platform = var.microarchitecture_map[substr(var.linux_machine_type, 0, 3)]
taint {
key = "buildbot-platform"
value = "linux"
Expand Down Expand Up @@ -127,7 +137,8 @@ resource "google_container_node_pool" "llvm_premerge_libcxx" {
}

node_config {
machine_type = var.libcxx_machine_type
machine_type = var.libcxx_machine_type
min_cpu_platform = var.microarchitecture_map[substr(var.libcxx_machine_type, 0, 3)]
taint {
key = "premerge-platform-libcxx"
value = "linux-libcxx"
Expand All @@ -154,7 +165,8 @@ resource "google_container_node_pool" "llvm_premerge_windows_2022" {
# We do not set a taint for the windows nodes as kubernetes by default sets
# a node.kubernetes.io/os taint for windows nodes.
node_config {
machine_type = var.windows_machine_type
machine_type = var.windows_machine_type
min_cpu_platform = var.microarchitecture_map[substr(var.windows_machine_type, 0, 3)]
labels = {
"premerge-platform" : "windows-2022"
}
Expand Down Expand Up @@ -204,7 +216,8 @@ resource "google_container_node_pool" "llvm_buildbot_window_2022" {
# Use the Linux machine type here as we want to keep the windows machines
# symmetric with the Linux machines for faster builds. Throughput is not
# as much of a concern postcommit.
machine_type = var.linux_machine_type
machine_type = var.linux_machine_type
min_cpu_platform = var.microarchitecture_map[substr(var.linux_machine_type, 0, 3)]
labels = {
"buildbot-platform" : "windows-2022"
}
Expand Down