Skip to content

Commit b4c4571

Browse files
authored
Migrate self-hosted workflows from ubuntu-20.04 to ubuntu-24.04 (#38133)
1 parent 6dd599c commit b4c4571

File tree

269 files changed

+289
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

269 files changed

+289
-289
lines changed

.github/ACTIONS.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Currently, we have both GitHub-hosted and self-hosted runners for running the Gi
2828
### Getting Started with self-hosted runners
2929
* Refer to [this README](./gh-actions-self-hosted-runners/README.md) for the steps for creating your own self-hosted runners for testing your workflows.
3030
* Depending on your workflow's needs, it must specify the following `runs-on` tags to run in the specified operating system:
31-
* Ubuntu 20.04 self-hosted runner: `[self-hosted, ubuntu-20.04]`
31+
* Ubuntu 24.04 self-hosted runner: `[self-hosted, ubuntu-24.04, main]` (also `small`, `highmem`, or `highmem22` pool labels as needed)
3232
* Windows Server 2019 self-hosted runner: `[self-hosted, windows-server-2019]`
3333
* MacOS GitHub-hosted runner: `macos-latest`
3434
* Every workflow that tests the source code, needs to have the workflow trigger `pull_request_target` instead of `pull_request`.
@@ -48,7 +48,7 @@ Currently, we have both GitHub-hosted and self-hosted runners for running the Gi
4848
node-version: 16
4949
```
5050
* You can find the GitHub-hosted runner installations in the following links:
51-
* [Ubuntu-20.04](https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2004-Readme.md#installed-apt-packages)
51+
* [Ubuntu-24.04](https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#installed-apt-packages)
5252
* [Windows-2019](https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md)
5353
5454
#### GitHub Actions Example
@@ -60,7 +60,7 @@ on:
6060
permissions: read-all
6161
jobs:
6262
github-actions-example:
63-
runs-on: [self-hosted, ubuntu-20.04]
63+
runs-on: [self-hosted, ubuntu-24.04, main]
6464
steps:
6565
- name: Check out repository code
6666
uses: actions/checkout@v2

.github/gh-actions-self-hosted-runners/arc/environments/beam.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ additional_runner_pools = [{
8686
{
8787
name = "highmem-runner-22"
8888
machine_type = "c3-highmem-22"
89-
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:d7cd81a1649bc665581951d2330c4b8acd19ed72"
89+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
9090
min_node_count = "0"
9191
max_node_count = "8"
9292
min_replicas = "0"
@@ -96,7 +96,7 @@ additional_runner_pools = [{
9696
cpu = "7.5"
9797
memory = "100Gi"
9898
}
99-
labels = ["self-hosted", "ubuntu-20.04", "highmem22"]
99+
labels = ["self-hosted", "ubuntu-24.04", "highmem22"]
100100
enable_selector = true
101101
enable_taint = true
102102
},

.github/workflows/IO_Iceberg_Integration_Tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
github.event_name == 'workflow_dispatch' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
5757
github.event.comment.body == 'Run IcebergIO Integration Test'
58-
runs-on: [self-hosted, ubuntu-20.04, main]
58+
runs-on: [self-hosted, ubuntu-24.04, main]
5959
timeout-minutes: 120
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:

.github/workflows/IO_Iceberg_Integration_Tests_Dataflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
github.event_name == 'workflow_dispatch' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
5757
github.event.comment.body == 'Run IcebergIO Integration Tests on Dataflow'
58-
runs-on: [self-hosted, ubuntu-20.04, main]
58+
runs-on: [self-hosted, ubuntu-24.04, main]
5959
timeout-minutes: 120
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:

.github/workflows/IO_Iceberg_Managed_Integration_Tests_Dataflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
github.event_name == 'workflow_dispatch' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
5757
github.event.comment.body == 'Run IcebergIO Managed Integration Tests on Dataflow'
58-
runs-on: [self-hosted, ubuntu-20.04, main]
58+
runs-on: [self-hosted, ubuntu-24.04, main]
5959
timeout-minutes: 120
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:

.github/workflows/IO_Iceberg_Performance_Tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
github.event_name == 'workflow_dispatch' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
5757
github.event.comment.body == 'Run IcebergIO Performance Test'
58-
runs-on: [self-hosted, ubuntu-20.04, main]
58+
runs-on: [self-hosted, ubuntu-24.04, main]
5959
timeout-minutes: 120
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:

.github/workflows/IO_Iceberg_Unit_Tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
8181
github.event_name == 'workflow_dispatch' ||
8282
github.event.comment.body == 'Run IcebergIO Unit Tests'
83-
runs-on: [self-hosted, ubuntu-20.04, main]
83+
runs-on: [self-hosted, ubuntu-24.04, main]
8484
steps:
8585
- uses: actions/checkout@v4
8686
- name: Setup repository

.github/workflows/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ And in case when the workflow already utilizes matrix do the following:
9191
jobs:
9292
beam_job_with_matrix:
9393
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
94-
runs-on: [self-hosted, ubuntu-20.04, main]
94+
runs-on: [self-hosted, ubuntu-24.04, main]
9595
timeout-minutes: 30
9696
strategy:
9797
fail-fast: false
@@ -180,9 +180,9 @@ Note: most workflows use [self-hosted runners](https://docs.github.com/en/action
180180
with the main and ubuntu labels to execute ([example](https://github.com/apache/beam/blob/5a54ee6ddd8cb8444c41802929a364fe2561001e/.github/workflows/beam_PostCommit_Go_Dataflow_ARM.yml#L41)).
181181
If you are testing on a fork, you likely will not have self-hosted runners set up.
182182
To work around this, you can start using hosted runners and then switch over when you're ready to create a PR.
183-
You can do this by changing `runs-on: [self-hosted, ubuntu-20.04, main]` (self-hosted, use in your PR) to `runs-on: ubuntu-20.04` (GitHub hosted, use for local testing).
183+
You can do this by changing `runs-on: [self-hosted, ubuntu-24.04, main]` (self-hosted, use in your PR) to `runs-on: ubuntu-24.04` (GitHub hosted, use for local testing).
184184

185-
Note when using `ubuntu-20.04` as the host, you might need to choose the Java version since some gradle tasks only work with a certain Java version.
185+
Note when using `ubuntu-24.04` as the host, you might need to choose the Java version since some gradle tasks only work with a certain Java version.
186186
One example is below to use Java 11 when testing your workflow:
187187
```
188188
steps:
@@ -211,7 +211,7 @@ If you run into this issue, you can either:
211211

212212
Additionally, as mentioned above your fork likely will not have self-hosted runners set up.
213213
To work around this, you can start using hosted runners and then switch over when you're ready to create a PR.
214-
You can do this by changing runs-on: [self-hosted, ubuntu-20.04, main] (self-hosted, use in your PR) to runs-on: ubuntu-20.04 (GitHub hosted, use for local testing).
214+
You can do this by changing runs-on: [self-hosted, ubuntu-24.04, main] (self-hosted, use in your PR) to runs-on: ubuntu-24.04 (GitHub hosted, use for local testing).
215215

216216
# Workflows
217217
Please note that jobs with matrix need to have matrix element in the comment. Example:

.github/workflows/beam_CancelStaleDataflowJobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ permissions:
5151
jobs:
5252
beam_CancelStaleDataflowJobs:
5353
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
54-
runs-on: [self-hosted, ubuntu-20.04, main]
54+
runs-on: [self-hosted, ubuntu-24.04, main]
5555
timeout-minutes: 120
5656
strategy:
5757
matrix:

.github/workflows/beam_CleanUpDataprocResources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
if: |
5252
github.event_name == 'workflow_dispatch' ||
5353
(github.event_name == 'schedule' && github.repository == 'apache/beam')
54-
runs-on: [self-hosted, ubuntu-20.04, main]
54+
runs-on: [self-hosted, ubuntu-24.04, main]
5555
timeout-minutes: 100
5656
name: "beam_CleanUpDataprocResources"
5757
steps:

0 commit comments

Comments
 (0)