Skip to content

Commit 9f6235f

Browse files
Merge remote-tracking branch 'upstream/master' into sinkWithMilvusIO
2 parents 07f6162 + 4114f7c commit 9f6235f

File tree

444 files changed

+12882
-21746
lines changed

Some content is hidden

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

444 files changed

+12882
-21746
lines changed

.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.67: {}
5455
release-2.66.0-postrelease: {}
5556
release-2.66: {}
5657
release-2.65.0-postrelease: {}

.gemini/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ code_review:
4646

4747
# Post code review on PR open.
4848
# Type boolean, default: true.
49-
code_review: true
49+
code_review: false
5050

5151
# List of glob patterns to ignore (files and directories).
5252
# Type: array of string, default: [].

.github/REVIEWERS.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ labels:
4949
reviewers:
5050
- igorbernstein2
5151
- mutianf
52-
- djyau
53-
- andre-sampaio
54-
- meeral-k
5552
exclusionList: []
5653
- name: kafka
5754
reviewers:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 4
3+
"modification": 101
44
}
55

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"comment": "Trigger file for PostCommit Python Portable Flink tests"
3+
}
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": 11
3+
"modification": 12
44
}
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": 3
3+
"modification": 4
44
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"https://github.com/apache/beam/pull/32648": "testing Flink 1.19 support",
3-
"modification": 2
2+
"modification": 4
43
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"https://github.com/apache/beam/pull/32440": "testing datastream optimizations",
3-
"https://github.com/apache/beam/pull/32648": "testing addition of Flink 1.19 support"
2+
"modification": 1
43
}

.github/workflows/beam_PostCommit_Python.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,21 @@ env:
5454
jobs:
5555
beam_PostCommit_Python:
5656
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }})
57-
runs-on: [self-hosted, ubuntu-20.04, highmem22]
57+
runs-on: ${{ matrix.os }}
5858
timeout-minutes: 240
5959
strategy:
6060
fail-fast: false
6161
matrix:
6262
job_name: [beam_PostCommit_Python]
6363
job_phrase: [Run Python PostCommit]
6464
python_version: ['3.9', '3.10', '3.11', '3.12']
65+
# Run on both self-hosted and GitHub-hosted runners.
66+
# Some tests (marked require_docker_in_docker) can't run on Beam's
67+
# self-hosted runners due to Docker-in-Docker environment constraint.
68+
# These tests will only execute on ubuntu-latest (GitHub-hosted).
69+
# Context: https://github.com/apache/beam/pull/35585
70+
# Temporary removed the ubuntu-latest env till resolving deps issues.
71+
os: [[self-hosted, ubuntu-20.04, highmem22]]
6572
if: |
6673
github.event_name == 'workflow_dispatch' ||
6774
github.event_name == 'pull_request_target' ||
@@ -99,6 +106,11 @@ jobs:
99106
arguments: |
100107
-Pjava21Home=$JAVA_HOME_21_X64 \
101108
-PuseWheelDistribution \
109+
-Pposargs="${{
110+
contains(matrix.os, 'self-hosted') &&
111+
'-m (not require_docker_in_docker)' ||
112+
'-m require_docker_in_docker'
113+
}}" \
102114
-PpythonVersion=${{ matrix.python_version }} \
103115
env:
104116
CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}

0 commit comments

Comments
 (0)