From 734c9296c4ba7e8206f667370214fa84124df06e Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Tue, 17 Feb 2026 18:54:19 +0200 Subject: [PATCH 1/2] Add Ubuntu 24.04 runner pools --- .../arc/environments/beam.env | 70 +++++++++++++++++++ .../arc/images/Dockerfile | 2 +- .../workflows/beam_PreCommit_PythonLint.yml | 2 +- .github/workflows/beam_PreCommit_RAT.yml | 2 +- .../workflows/beam_PreCommit_Whitespace.yml | 2 +- .github/workflows/go_tests.yml | 2 +- .github/workflows/typescript_tests.yml | 6 +- 7 files changed, 78 insertions(+), 8 deletions(-) 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 diff --git a/.github/workflows/beam_PreCommit_PythonLint.yml b/.github/workflows/beam_PreCommit_PythonLint.yml index 1a915e0b65be..de97b3b3379a 100644 --- a/.github/workflows/beam_PreCommit_PythonLint.yml +++ b/.github/workflows/beam_PreCommit_PythonLint.yml @@ -57,7 +57,7 @@ env: jobs: beam_PreCommit_PythonLint: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-20.04, main] + runs-on: [self-hosted, ubuntu-24.04, main] strategy: matrix: job_name: [beam_PreCommit_PythonLint] diff --git a/.github/workflows/beam_PreCommit_RAT.yml b/.github/workflows/beam_PreCommit_RAT.yml index 51441207fa41..dd8c173fde92 100644 --- a/.github/workflows/beam_PreCommit_RAT.yml +++ b/.github/workflows/beam_PreCommit_RAT.yml @@ -56,7 +56,7 @@ env: jobs: beam_PreCommit_RAT: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-20.04, main] + runs-on: [self-hosted, ubuntu-24.04, main] strategy: matrix: job_name: [beam_PreCommit_RAT] diff --git a/.github/workflows/beam_PreCommit_Whitespace.yml b/.github/workflows/beam_PreCommit_Whitespace.yml index a378991dcfcb..d2e87870d646 100644 --- a/.github/workflows/beam_PreCommit_Whitespace.yml +++ b/.github/workflows/beam_PreCommit_Whitespace.yml @@ -57,7 +57,7 @@ env: jobs: beam_PreCommit_Whitespace: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-20.04, main] + runs-on: [self-hosted, ubuntu-24.04, main] strategy: matrix: job_name: [beam_PreCommit_Whitespace] diff --git a/.github/workflows/go_tests.yml b/.github/workflows/go_tests.yml index 418db00dbe5a..e5289e096787 100644 --- a/.github/workflows/go_tests.yml +++ b/.github/workflows/go_tests.yml @@ -36,7 +36,7 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: [self-hosted, ubuntu-20.04, main] + runs-on: [self-hosted, ubuntu-24.04, main] name: Go Build steps: - name: Check out code diff --git a/.github/workflows/typescript_tests.yml b/.github/workflows/typescript_tests.yml index 5354e4a72c97..e5a39da9d14d 100644 --- a/.github/workflows/typescript_tests.yml +++ b/.github/workflows/typescript_tests.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - os: [[self-hosted, ubuntu-20.04], macos-latest] + os: [[self-hosted, ubuntu-24.04], macos-latest] steps: - name: Check out code uses: actions/checkout@v4 @@ -77,7 +77,7 @@ jobs: working-directory: ./sdks/typescript env: NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload' - if: contains(matrix.os, 'ubuntu-20.04') + if: contains(matrix.os, 'ubuntu-24.04') # - run: npm run codecovTest # working-directory: ./sdks/typescript # if: ${{ matrix.os == 'ubuntu-latest' }} @@ -90,7 +90,7 @@ jobs: name: 'TypeScript xlang Tests' # TODO(https://github.com/apache/beam/issues/33346): remove manual trigger after fixing referenced issue. if: (github.event_name == 'workflow_dispatch' && github.event.inputs.runXlang == 'true') - runs-on: [self-hosted, ubuntu-20.04] + runs-on: [self-hosted, ubuntu-24.04] timeout-minutes: 15 strategy: fail-fast: false From feb1edf8e9f45a78532653119b6d65b767724bf2 Mon Sep 17 00:00:00 2001 From: aIbrahiim Date: Tue, 17 Feb 2026 19:08:54 +0200 Subject: [PATCH 2/2] revert workflows runs --- .github/workflows/beam_PreCommit_PythonLint.yml | 2 +- .github/workflows/beam_PreCommit_RAT.yml | 2 +- .github/workflows/beam_PreCommit_Whitespace.yml | 2 +- .github/workflows/go_tests.yml | 2 +- .github/workflows/typescript_tests.yml | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/beam_PreCommit_PythonLint.yml b/.github/workflows/beam_PreCommit_PythonLint.yml index de97b3b3379a..1a915e0b65be 100644 --- a/.github/workflows/beam_PreCommit_PythonLint.yml +++ b/.github/workflows/beam_PreCommit_PythonLint.yml @@ -57,7 +57,7 @@ env: jobs: beam_PreCommit_PythonLint: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-24.04, main] + runs-on: [self-hosted, ubuntu-20.04, main] strategy: matrix: job_name: [beam_PreCommit_PythonLint] diff --git a/.github/workflows/beam_PreCommit_RAT.yml b/.github/workflows/beam_PreCommit_RAT.yml index dd8c173fde92..51441207fa41 100644 --- a/.github/workflows/beam_PreCommit_RAT.yml +++ b/.github/workflows/beam_PreCommit_RAT.yml @@ -56,7 +56,7 @@ env: jobs: beam_PreCommit_RAT: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-24.04, main] + runs-on: [self-hosted, ubuntu-20.04, main] strategy: matrix: job_name: [beam_PreCommit_RAT] diff --git a/.github/workflows/beam_PreCommit_Whitespace.yml b/.github/workflows/beam_PreCommit_Whitespace.yml index d2e87870d646..a378991dcfcb 100644 --- a/.github/workflows/beam_PreCommit_Whitespace.yml +++ b/.github/workflows/beam_PreCommit_Whitespace.yml @@ -57,7 +57,7 @@ env: jobs: beam_PreCommit_Whitespace: name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) - runs-on: [self-hosted, ubuntu-24.04, main] + runs-on: [self-hosted, ubuntu-20.04, main] strategy: matrix: job_name: [beam_PreCommit_Whitespace] diff --git a/.github/workflows/go_tests.yml b/.github/workflows/go_tests.yml index e5289e096787..418db00dbe5a 100644 --- a/.github/workflows/go_tests.yml +++ b/.github/workflows/go_tests.yml @@ -36,7 +36,7 @@ concurrency: cancel-in-progress: true jobs: build: - runs-on: [self-hosted, ubuntu-24.04, main] + runs-on: [self-hosted, ubuntu-20.04, main] name: Go Build steps: - name: Check out code diff --git a/.github/workflows/typescript_tests.yml b/.github/workflows/typescript_tests.yml index e5a39da9d14d..5354e4a72c97 100644 --- a/.github/workflows/typescript_tests.yml +++ b/.github/workflows/typescript_tests.yml @@ -51,7 +51,7 @@ jobs: strategy: fail-fast: false matrix: - os: [[self-hosted, ubuntu-24.04], macos-latest] + os: [[self-hosted, ubuntu-20.04], macos-latest] steps: - name: Check out code uses: actions/checkout@v4 @@ -77,7 +77,7 @@ jobs: working-directory: ./sdks/typescript env: NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload' - if: contains(matrix.os, 'ubuntu-24.04') + if: contains(matrix.os, 'ubuntu-20.04') # - run: npm run codecovTest # working-directory: ./sdks/typescript # if: ${{ matrix.os == 'ubuntu-latest' }} @@ -90,7 +90,7 @@ jobs: name: 'TypeScript xlang Tests' # TODO(https://github.com/apache/beam/issues/33346): remove manual trigger after fixing referenced issue. if: (github.event_name == 'workflow_dispatch' && github.event.inputs.runXlang == 'true') - runs-on: [self-hosted, ubuntu-24.04] + runs-on: [self-hosted, ubuntu-20.04] timeout-minutes: 15 strategy: fail-fast: false