Skip to content

Commit f8d19fe

Browse files
committed
Merge branch 'master' into run-rc-go
2 parents 2cc68ac + b111d73 commit f8d19fe

File tree

83 files changed

+4162
-652
lines changed

Some content is hidden

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

83 files changed

+4162
-652
lines changed

.asf.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ github:
5151

5252
protected_branches:
5353
master: {}
54+
release-2.64.0-postrelease: {}
5455
release-2.64: {}
5556
release-2.63.0-postrelease: {}
5657
release-2.63: {}

.github/REVIEWERS.yml

+8-16
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

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

+1-1
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/**/*"]
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/workflows/beam_PostCommit_Java_SingleStoreIO_IT.yml

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

+9-1
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 "==============================================================="

.github/workflows/refresh_looker_metrics.yml

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
name: Refresh Looker Performance Metrics
1919

2020
on:
21-
schedule:
22-
- cron: '10 10 * * 1'
2321
workflow_dispatch:
2422
inputs:
2523
READ_ONLY:

.github/workflows/republish_released_docker_containers.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232
- cron: "0 6 * * 1"
3333
env:
3434
docker_registry: gcr.io
35-
release: "${{ github.event.inputs.RELEASE || '2.63.0' }}"
35+
release: "${{ github.event.inputs.RELEASE || '2.64.0' }}"
3636
rc: "${{ github.event.inputs.RC || '2' }}"
3737

3838
jobs:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Run Java QuickStart RC Validation
19+
20+
on:
21+
workflow_dispatch:
22+
inputs:
23+
RELEASE_VER:
24+
description: 'Beam Release Version (e.g., 2.64.0)'
25+
required: true
26+
default: '2.xx.0'
27+
RC_NUM:
28+
description: 'Release Candidate number (e.g., 1)'
29+
required: true
30+
default: '1'
31+
APACHE_CONTENTS_REPO:
32+
description: 'Apache Staging Repository URL (e.g., https://repository.apache.org/content/repositories/orgapachebeam-1234)'
33+
required: true
34+
35+
# This allows a subsequently queued workflow run to interrupt previous runs
36+
concurrency:
37+
group: '${{ github.workflow }} @ ${{ github.event.inputs.RELEASE_VER }}-${{ github.event.inputs.RC_NUM }}'
38+
cancel-in-progress: true
39+
40+
# Setting explicit permissions for the action
41+
permissions:
42+
actions: write
43+
pull-requests: write # Needed for setup-action potentially
44+
checks: write
45+
contents: read # Needs read to checkout the code
46+
deployments: read
47+
id-token: write # Required for GCP Workload Identity Federation (if needed by setup)
48+
issues: write
49+
discussions: read
50+
packages: read
51+
pages: read
52+
repository-projects: read
53+
security-events: read
54+
statuses: read
55+
56+
env:
57+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
58+
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
59+
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
60+
APACHE_REPO_URL: ${{ github.event.inputs.APACHE_CONTENTS_REPO }}
61+
RELEASE_VERSION: ${{ github.event.inputs.RELEASE_VER }}
62+
RC_TAG: "v${{github.event.inputs.RELEASE_VER}}-RC${{github.event.inputs.RC_NUM}}"
63+
64+
jobs:
65+
run_java_quickstart_rc_validation:
66+
name: Run Java QuickStart RC Validation (${{ github.event.inputs.RELEASE_VER }} RC${{ github.event.inputs.RC_NUM }})
67+
runs-on: [self-hosted, ubuntu-20.04, main]
68+
timeout-minutes: 60 # Adjust timeout as needed
69+
steps:
70+
- name: Checkout code at RC tag
71+
uses: actions/checkout@v4
72+
with:
73+
ref: ${{ env.RC_TAG }}
74+
75+
- name: Setup environment
76+
uses: ./.github/actions/setup-environment-action
77+
with:
78+
java-version: 11
79+
80+
- name: Run QuickStart Java Direct Runner
81+
uses: ./.github/actions/gradle-command-self-hosted-action
82+
with:
83+
gradle-command: :runners:direct-java:runQuickstartJavaDirect
84+
arguments: |
85+
-Prepourl=${{ env.APACHE_REPO_URL }} \
86+
-Pver=${{ env.RELEASE_VERSION }}
87+
88+
- name: Run QuickStart Java Flink Runner
89+
uses: ./.github/actions/gradle-command-self-hosted-action
90+
with:
91+
gradle-command: :runners:flink:1.19:runQuickstartJavaFlinkLocal
92+
arguments: |
93+
-Prepourl=${{ env.APACHE_REPO_URL }} \
94+
-Pver=${{ env.RELEASE_VERSION }}
95+
96+
- name: Run QuickStart Java Spark Runner
97+
uses: ./.github/actions/gradle-command-self-hosted-action
98+
with:
99+
gradle-command: :runners:spark:3:runQuickstartJavaSpark
100+
arguments: |
101+
-Prepourl=${{ env.APACHE_REPO_URL }} \
102+
-Pver=${{ env.RELEASE_VERSION }}

0 commit comments

Comments
 (0)