Skip to content

Commit b24fdea

Browse files
authored
Merge branch 'master' into 20260213_createYamlDynamicDestinationExample
2 parents 354b44e + 193db39 commit b24fdea

229 files changed

Lines changed: 8239 additions & 2917 deletions

File tree

Some content is hidden

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

.agent/skills/gradle-build/SKILL.md

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,32 @@ applyJavaNature(
154154
./gradlew :sdks:java:container:java11:docker
155155

156156
# Build Python SDK container
157-
./gradlew :sdks:python:container:py39:docker
157+
./gradlew :sdks:python:container:py312:docker
158158

159-
# With custom repository
159+
# Build and push a container into a custom repository
160160
./gradlew :sdks:java:container:java11:docker \
161161
-Pdocker-repository-root=gcr.io/project \
162-
-Pdocker-tag=custom
162+
-Pdocker-tag=custom \
163+
-Ppush-containers
164+
```
165+
166+
If a `:docker` task produces logs that contain the following:
167+
168+
```
169+
WARNING: No output specified with docker-container driver.
170+
Build result will only remain in the build cache.
171+
```
172+
173+
then you must use `-PuseDockerBuildx` when running `:docker` tasks
174+
in this environment. For example:
175+
176+
```
177+
# Build and push a go container into a custom repository
178+
./gradlew :sdks:go:container:docker \
179+
-Pdocker-repository-root=gcr.io/project \
180+
-Pdocker-tag=custom \
181+
-Ppush-containers \
182+
-PuseDockerBuildx
163183
```
164184

165185
## Dependency Management

.agent/skills/python-development/SKILL.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,18 @@ pip install build && python -m build --sdist
123123
./gradlew :sdks:python:bdistPy311linux # For Python 3.11 on Linux
124124
```
125125

126-
### Build SDK Container
126+
### Build and Push SDK Container Image
127127
```bash
128-
./gradlew :sdks:python:container:py39:docker \
129-
-Pdocker-repository-root=gcr.io/your-project -Pdocker-tag=custom
128+
./gradlew :sdks:python:container:py311:docker \
129+
-Pdocker-repository-root=gcr.io/your-project/your-name \
130+
-Pdocker-tag=custom \
131+
-Ppush-containers
132+
133+
# Container image will be pushed to: gcr.io/your-project/your-name/beam_python3.11_sdk:custom
130134
```
131135

136+
To use this container image, supply it via `--sdk_container_image`.
137+
132138
## Running Pipelines with Modified Code
133139

134140
```bash

.asf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ github:
5151

5252
protected_branches:
5353
master: {}
54+
release-2.72: {}
5455
release-2.71.0-postrelease: {}
5556
release-2.71: {}
5657
release-2.70.0-postrelease: {}

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ main_runner = {
4747
cpu = "2"
4848
memory = "3Gi"
4949
}
50+
labels = ["self-hosted", "ubuntu-20.04", "main"]
5051
}
5152
additional_runner_pools = [{
5253
name = "small-runner"
@@ -98,5 +99,74 @@ additional_runner_pools = [{
9899
labels = ["self-hosted", "ubuntu-20.04", "highmem22"]
99100
enable_selector = true
100101
enable_taint = true
102+
},
103+
{
104+
name = "main-runner-2404"
105+
machine_type = "e2-standard-16"
106+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
107+
min_node_count = "1"
108+
max_node_count = "30"
109+
min_replicas = "1"
110+
max_replicas = "240"
111+
webhook_scaling = false
112+
disk_size_gb = 200
113+
requests = {
114+
cpu = "2"
115+
memory = "3Gi"
116+
}
117+
labels = ["self-hosted", "ubuntu-24.04", "main"]
118+
enable_selector = true
119+
enable_taint = true
120+
},
121+
{
122+
name = "small-runner-2404"
123+
machine_type = "e2-standard-2"
124+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
125+
min_node_count = "1"
126+
max_node_count = "15"
127+
min_replicas = "1"
128+
max_replicas = "15"
129+
webhook_scaling = false
130+
requests = {
131+
cpu = "1500m"
132+
memory = "5Gi"
133+
}
134+
labels = ["self-hosted", "ubuntu-24.04", "small"]
135+
enable_selector = true
136+
enable_taint = true
137+
},
138+
{
139+
name = "highmem-runner-2404"
140+
machine_type = "c3-highmem-8"
141+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
142+
min_node_count = "1"
143+
max_node_count = "15"
144+
min_replicas = "1"
145+
max_replicas = "15"
146+
webhook_scaling = false
147+
requests = {
148+
cpu = "7.5"
149+
memory = "5Gi"
150+
}
151+
labels = ["self-hosted", "ubuntu-24.04", "highmem"]
152+
enable_selector = true
153+
enable_taint = true
154+
},
155+
{
156+
name = "highmem-runner-22-2404"
157+
machine_type = "c3-highmem-22"
158+
runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:latest"
159+
min_node_count = "0"
160+
max_node_count = "8"
161+
min_replicas = "0"
162+
max_replicas = "8"
163+
webhook_scaling = false
164+
requests = {
165+
cpu = "7.5"
166+
memory = "100Gi"
167+
}
168+
labels = ["self-hosted", "ubuntu-24.04", "highmem22"]
169+
enable_selector = true
170+
enable_taint = true
101171
}]
102172
#state_bucket_name = "beam-arc-state"

.github/gh-actions-self-hosted-runners/arc/images/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner:ubuntu-20.04
20+
FROM ghcr.io/actions-runner-controller/actions-runner-controller/actions-runner:ubuntu-24.04
2121
#install BuildX
2222
COPY --from=docker/buildx-bin:0.11.1 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
2323
RUN docker buildx install && docker buildx version
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 1
3+
"modification": 2
44
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 1,
3+
"modification": 2,
44
"https://github.com/apache/beam/pull/32440": "testing datastream optimizations",
55
"https://github.com/apache/beam/pull/32648": "testing addition of Flink 1.19 support"
66
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 4
4-
}
3+
"modification": 6
4+
}

.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
"comment": "Modify this file in a trivial way to cause this test suite to run!",
33
"modification": 3,
44
}
5+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"comment": "Modify this file in a trivial way to cause this test suite to run!",
3+
"modification": 1
4+
}

0 commit comments

Comments
 (0)