diff --git a/.github/gh-actions-self-hosted-runners/arc/environments/beam.env b/.github/gh-actions-self-hosted-runners/arc/environments/beam.env index a9a0afc4ed40..f32047489b2e 100644 --- a/.github/gh-actions-self-hosted-runners/arc/environments/beam.env +++ b/.github/gh-actions-self-hosted-runners/arc/environments/beam.env @@ -47,6 +47,7 @@ main_runner = { cpu = "2" memory = "3Gi" } + labels = ["self-hosted", "ubuntu-20.04", "main"] } additional_runner_pools = [{ name = "small-runner" @@ -98,5 +99,74 @@ additional_runner_pools = [{ labels = ["self-hosted", "ubuntu-20.04", "highmem22"] enable_selector = true enable_taint = true +}, +{ + name = "main-runner-2404" + machine_type = "e2-standard-16" + runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest" + min_node_count = "1" + max_node_count = "30" + min_replicas = "1" + max_replicas = "240" + webhook_scaling = false + disk_size_gb = 200 + requests = { + cpu = "2" + memory = "3Gi" + } + labels = ["self-hosted", "ubuntu-24.04", "main"] + enable_selector = true + enable_taint = true +}, +{ + name = "small-runner-2404" + machine_type = "e2-standard-2" + runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest" + min_node_count = "1" + max_node_count = "15" + min_replicas = "1" + max_replicas = "15" + webhook_scaling = false + requests = { + cpu = "1500m" + memory = "5Gi" + } + labels = ["self-hosted", "ubuntu-24.04", "small"] + enable_selector = true + enable_taint = true +}, +{ + name = "highmem-runner-2404" + machine_type = "c3-highmem-8" + runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest" + min_node_count = "1" + max_node_count = "15" + min_replicas = "1" + max_replicas = "15" + webhook_scaling = false + requests = { + cpu = "7.5" + memory = "5Gi" + } + labels = ["self-hosted", "ubuntu-24.04", "highmem"] + enable_selector = true + enable_taint = true +}, +{ + name = "highmem-runner-22-2404" + machine_type = "c3-highmem-22" + runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest" + min_node_count = "0" + max_node_count = "8" + min_replicas = "0" + max_replicas = "8" + webhook_scaling = false + requests = { + cpu = "7.5" + memory = "100Gi" + } + labels = ["self-hosted", "ubuntu-24.04", "highmem22"] + enable_selector = true + enable_taint = true }] #state_bucket_name = "beam-arc-state" diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile index 9ea7e0738997..8f4a42080c22 100644 --- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile +++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner:ubuntu-20.04 +FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner:ubuntu-24.04 #install BuildX COPY --from=docker/buildx-bin:0.11.1 /buildx /usr/libexec/docker/cli-plugins/docker-buildx RUN docker buildx install && docker buildx version