Skip to content

Commit eea4974

Browse files
Chenzo1001Chenzo1001
authored
Merge branch 'apache:master' into master
2 parents 9597908 + d1f3c49 commit eea4974

File tree

86 files changed

+4208
-795
lines changed

Some content is hidden

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

86 files changed

+4208
-795
lines changed

‎.github/REVIEWERS.yml‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
labels:
2121
- name: Go
2222
reviewers:
23-
- lostluck
2423
- jrmccluskey
25-
exclusionList:
26-
- youngoli
24+
- lostluck
25+
exclusionList: []
2726
- name: Python
2827
reviewers:
28+
- claudevdm
2929
- damccorm
3030
- jrmccluskey
3131
- tvalentyn
@@ -34,20 +34,13 @@ labels:
3434
exclusionList: []
3535
- name: Java
3636
reviewers:
37-
- Abacn
38-
- kennknowles
39-
- robertwb
40-
- m-trieu
41-
- damondouglas
42-
exclusionList: []
43-
- name: IO
44-
reviewers:
45-
- chamikaramj
46-
- johnjcasey
4737
- Abacn
4838
- ahmedabu98
49-
- damondouglas
39+
- chamikaramj
40+
- m-trieu
41+
- kennknowles
5042
- shunping
43+
- robertwb
5144
exclusionList: []
5245
- name: spanner
5346
reviewers:
@@ -68,8 +61,8 @@ labels:
6861
- sjvanrossum
6962
- name: Build
7063
reviewers:
71-
- damccorm
7264
- Abacn
65+
- damccorm
7366
exclusionList: []
7467
- name: website
7568
reviewers:
@@ -83,7 +76,6 @@ fallbackReviewers:
8376
- Abacn
8477
- chamikaramj
8578
- damccorm
86-
- damondouglas
8779
- johnjcasey
8880
- jrmccluskey
8981
- kennknowles

‎.github/actions/setup-k8s-access/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ runs:
6868
run: |
6969
kubectl config set-context --current --namespace=${{ steps.replace_namespace.outputs.TEST_NAMESPACE }}
7070
- name: Post cleanup
71-
uses: pyTooling/Actions/with-post-step@v0.4.6
71+
uses: pyTooling/Actions/with-post-step@v4.2.2
7272
with:
7373
main: echo "Post Cleanup"
7474
post: |

‎.github/autolabeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# Please keep the entries sorted lexicographically in each category.
1919

2020
# General
21-
build: ["assembly.xml", "build.gradle.kts", "buildSrc/**/*", ".gitattributes", ".github/**/*", ".gitignore", "gradle/**/*", ".mailmap", "ownership/**/*", "release/**/*", "sdks/java/build-tools/**/*", "settings.gradle.kts"]
21+
build: ["assembly.xml", "buildSrc/**/*", ".gitattributes", ".github/workflows/*", ".gitignore", "gradle/**/*", ".mailmap", "release/**/*", "sdks/java/build-tools/**/*"]
2222
docker: ["runners/flink/job-server-container/**/*", "runners/spark/job-server/container/**/*", "sdks/go/container/**/*", "sdks/java/container/**/*", "sdks/python/container/**/*"]
2323
examples: ["examples/**/*", "sdks/go/examples/**/*", "sdks/python/apache_beam/examples/**/*"]
2424
go: ["sdks/go/**/*", "sdks/go.mod", "sdks/go.sum", "learning/katas/go/**/*"]

‎.github/trigger_files/IO_Iceberg_Integration_Tests.json‎

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": 4
3+
"modification": 3
44
}

‎.github/trigger_files/IO_Iceberg_Integration_Tests_Dataflow.json‎

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+
}

‎.github/trigger_files/IO_Iceberg_Managed_Integration_Tests_Dataflow.json‎

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+
}

‎.github/workflows/IO_Iceberg_Integration_Tests_Dataflow.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: IcebergIO Integration Tests on Dataflow
17+
18+
on:
19+
schedule:
20+
- cron: '30 4/6 * * *'
21+
pull_request_target:
22+
paths: [ 'release/trigger_all_tests.json', '.github/trigger_files/IO_Iceberg_Integration_Tests_Dataflow.json' ]
23+
workflow_dispatch:
24+
25+
# Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
26+
permissions:
27+
actions: write
28+
pull-requests: write
29+
checks: write
30+
contents: read
31+
deployments: read
32+
id-token: none
33+
issues: write
34+
discussions: read
35+
packages: read
36+
pages: read
37+
repository-projects: read
38+
security-events: read
39+
statuses: read
40+
41+
# This allows a subsequently queued workflow run to interrupt previous runs
42+
concurrency:
43+
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login }}'
44+
cancel-in-progress: true
45+
46+
env:
47+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
48+
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
49+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
50+
51+
jobs:
52+
IO_Iceberg_Integration_Tests_Dataflow:
53+
if: |
54+
github.event_name == 'pull_request_target' ||
55+
github.event_name == 'workflow_dispatch' ||
56+
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
57+
github.event.comment.body == 'Run IcebergIO Integration Tests on Dataflow'
58+
runs-on: [self-hosted, ubuntu-20.04, main]
59+
timeout-minutes: 120
60+
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
61+
strategy:
62+
matrix:
63+
job_name: ["IO_Iceberg_Integration_Tests_Dataflow"]
64+
job_phrase: ["Run IcebergIO Integration Tests on Dataflow"]
65+
steps:
66+
- uses: actions/checkout@v4
67+
- name: Setup repository
68+
uses: ./.github/actions/setup-action
69+
with:
70+
comment_phrase: ${{ matrix.job_phrase }}
71+
github_token: ${{ secrets.GITHUB_TOKEN }}
72+
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
73+
- name: Setup environment
74+
uses: ./.github/actions/setup-environment-action
75+
- name: Run IcebergIO Integration Tests on Dataflow
76+
uses: ./.github/actions/gradle-command-self-hosted-action
77+
with:
78+
gradle-command: :sdks:java:io:iceberg:dataflowIntegrationTest --info

‎.github/workflows/IO_Iceberg_Managed_Integration_Tests_Dataflow.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: IcebergIO Managed Integration Tests on Dataflow
17+
18+
on:
19+
schedule:
20+
- cron: '30 4/6 * * *'
21+
pull_request_target:
22+
paths: [ 'release/trigger_all_tests.json', '.github/trigger_files/IO_Iceberg_Managed_Integration_Tests_Dataflow.json' ]
23+
workflow_dispatch:
24+
25+
# Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
26+
permissions:
27+
actions: write
28+
pull-requests: write
29+
checks: write
30+
contents: read
31+
deployments: read
32+
id-token: none
33+
issues: write
34+
discussions: read
35+
packages: read
36+
pages: read
37+
repository-projects: read
38+
security-events: read
39+
statuses: read
40+
41+
# This allows a subsequently queued workflow run to interrupt previous runs
42+
concurrency:
43+
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login }}'
44+
cancel-in-progress: true
45+
46+
env:
47+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
48+
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
49+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
50+
51+
jobs:
52+
IO_Iceberg_Managed_Integration_Tests_Dataflow:
53+
if: |
54+
github.event_name == 'pull_request_target' ||
55+
github.event_name == 'workflow_dispatch' ||
56+
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
57+
github.event.comment.body == 'Run IcebergIO Managed Integration Tests on Dataflow'
58+
runs-on: [self-hosted, ubuntu-20.04, main]
59+
timeout-minutes: 120
60+
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
61+
strategy:
62+
matrix:
63+
job_name: ["IO_Iceberg_Managed_Integration_Tests_Dataflow"]
64+
job_phrase: ["Run IcebergIO Managed Integration Tests on Dataflow"]
65+
steps:
66+
- uses: actions/checkout@v4
67+
- name: Setup repository
68+
uses: ./.github/actions/setup-action
69+
with:
70+
comment_phrase: ${{ matrix.job_phrase }}
71+
github_token: ${{ secrets.GITHUB_TOKEN }}
72+
github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
73+
- name: Setup environment
74+
uses: ./.github/actions/setup-environment-action
75+
- name: Run IcebergIO Managed Integration Tests on Dataflow
76+
uses: ./.github/actions/gradle-command-self-hosted-action
77+
with:
78+
gradle-command: :sdks:java:io:iceberg:dataflowIntegrationTest
79+
arguments: |
80+
--info \
81+
-PenableManagedTransforms

‎.github/workflows/beam_PostCommit_Java_SingleStoreIO_IT.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@ jobs:
8787
kubectl apply -f ${{github.workspace}}/.test-infra/kubernetes/singlestore/sdb-rbac.yaml
8888
kubectl apply -f ${{github.workspace}}/.test-infra/kubernetes/singlestore/sdb-cluster-crd.yaml
8989
kubectl apply -f ${{github.workspace}}/.test-infra/kubernetes/singlestore/sdb-operator.yaml
90-
kubectl wait --for=condition=Ready pod -l name=sdb-operator --timeout=120s
90+
kubectl wait --for=condition=Ready pod -l name=sdb-operator --timeout=300s
9191
- name: Install SingleStore cluster
9292
id: install_singlestore
9393
run: |
9494
kubectl apply -f ${{github.workspace}}/.test-infra/kubernetes/singlestore/sdb-cluster.yaml
95-
kubectl wait --for=jsonpath='{.status.phase}'=Running memsqlclusters.memsql.com --all --timeout=120s
96-
kubectl wait svc/svc-sdb-cluster-ddl --for=jsonpath='{.status.loadBalancer.ingress[0].ip}' --timeout=120s
95+
kubectl wait --for=jsonpath='{.status.phase}'=Running memsqlclusters.memsql.com --all --timeout=300s
96+
kubectl wait svc/svc-sdb-cluster-ddl --for=jsonpath='{.status.loadBalancer.ingress[0].ip}' --timeout=300s
9797
loadbalancer_IP=$(kubectl get svc svc-sdb-cluster-ddl -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
9898
echo lb_ip=$loadbalancer_IP >> $GITHUB_OUTPUT
9999
- name: Run Java SingleStore IO IT

‎.github/workflows/cut_release_branch.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ jobs:
9797
steps:
9898
- name: Validate Next Version
9999
run: |
100+
if [[ ${RELEASE} =~ ([0-9]+\.[0-9]+) ]]; then
101+
echo "RELEASE_CUT_TAG=v${RELEASE}.0-RC00" >> $GITHUB_ENV
102+
else
103+
echo "The input for RELEASE does not match a valid format [0-9]+\.[0-9]+"
104+
exit 1
105+
fi
100106
if [[ $NEXT_RELEASE =~ ([0-9]+\.[0-9]+) ]]; then
101107
echo "NEXT_VERSION_IN_BASE_BRANCH=${BASH_REMATCH[1]}.0" >> $GITHUB_ENV
102108
else
@@ -116,7 +122,9 @@ jobs:
116122
sed -i -e "s/master: {}/master: {}\n release-${RELEASE}: {}/g" .asf.yaml
117123
- name: Update master branch
118124
run: |
119-
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}"
125+
bash "${SCRIPT_DIR}/set_version.sh" "${NEXT_VERSION_IN_BASE_BRANCH}" "--add-tag" "${RELEASE_CUT_TAG}"
126+
echo "==============tag RC00 to current master branch================"
127+
git push origin tag "${RELEASE_CUT_TAG}"
120128
echo "==============Update master branch as following================"
121129
git diff
122130
echo "==============================================================="

0 commit comments

Comments
 (0)