Skip to content

Commit f4d7d00

Browse files
[CI] Misc Changes to get libcxx runners working
There were a couple issues that this patch solves: * Changes the start path in the container to be correct * Makes the node selector correct * Fixes a typo in the container images
1 parent 5ea0686 commit f4d7d00

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

premerge/libcxx_runners_values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ template:
1717
value: "linux-libcxx"
1818
effect: "NoSchedule"
1919
nodeSelector:
20-
premerge-platform-libcxx: linux
20+
premerge-platform-libcxx: linux-libcxx
2121
containers:
2222
- name: runner
2323
image: ${ runner_image }
24-
command: ["/home/gha/actions-runner/run.sh"]
24+
command: ["/home/runner/run.sh"]
2525
resources:
2626
# If we don't set the CPU request high-enough here, 2 runners might
2727
# be scheduled on the same pod, meaning 2 jobs, and they will starve

premerge/premerge_resources/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ variable "runner_group_name" {
5757

5858
variable "libcxx_runner_image" {
5959
type = string
60-
default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f51d8ca1dad84122ef73927c86512"
60+
default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512"
6161
}
6262

6363
variable "libcxx_release_runner_image" {
6464
type = string
65-
default = "ghcr.io/llvm/libcxx-linux-builder:d8a0709b1090350a7fe3604d8ab78c7d62f10698"
65+
default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512"
6666
}
6767

6868
# Same value as libcxx_runner_image at this time.
6969
variable "libcxx_next_runner_image" {
7070
type = string
71-
default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f51d8ca1dad84122ef73927c86512"
71+
default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512"
7272
}

0 commit comments

Comments
 (0)