[llvm-zorg] Fix various issues with the libcxx premerge runner configs. - Correct container image name (was missing a digit) - Fix container image path to run.sh - Update nodeSelector to use linux-libcxx rather than linux.
diff --git a/premerge/libcxx_runners_values.yaml b/premerge/libcxx_runners_values.yaml index 10e50ed..8358582 100644 --- a/premerge/libcxx_runners_values.yaml +++ b/premerge/libcxx_runners_values.yaml
@@ -17,11 +17,11 @@ value: "linux-libcxx" effect: "NoSchedule" nodeSelector: - premerge-platform-libcxx: linux + premerge-platform-libcxx: linux-libcxx containers: - name: runner image: ${ runner_image } - command: ["/home/gha/actions-runner/run.sh"] + command: ["/home/runner/run.sh"] resources: # If we don't set the CPU request high-enough here, 2 runners might # be scheduled on the same pod, meaning 2 jobs, and they will starve
diff --git a/premerge/premerge_resources/variables.tf b/premerge/premerge_resources/variables.tf index 7ed491c..5afc145 100644 --- a/premerge/premerge_resources/variables.tf +++ b/premerge/premerge_resources/variables.tf
@@ -57,7 +57,7 @@ variable "libcxx_runner_image" { type = string - default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f51d8ca1dad84122ef73927c86512" + default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512" } variable "libcxx_release_runner_image" { @@ -68,5 +68,5 @@ # Same value as libcxx_runner_image at this time. variable "libcxx_next_runner_image" { type = string - default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f51d8ca1dad84122ef73927c86512" + default = "ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512" }