Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kerrydc authored Oct 12, 2023
2 parents ddf272b + 7449b67 commit b67fe0c
Show file tree
Hide file tree
Showing 395 changed files with 13,323 additions and 5,509 deletions.
4 changes: 4 additions & 0 deletions .github/REVIEWERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ labels:
- name: spanner
reviewers:
- nielm
- name: bigtable
reviewers:
- igorbernstein2
- mutianf
exclusionList: []
- name: Build
reviewers:
Expand Down
1 change: 1 addition & 0 deletions .github/autolabeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ io: ["sdks/go/pkg/beam/io/**/*", "sdks/java/io/**/*", "sdks/python/apache_beam/
"redis": ["sdks/java/io/redis/**/*"]
"solr": ["sdks/java/io/solr/**/*"]
"spanner": ["sdks/go/pkg/beam/io/spannerio/**/*", "sdks/python/apache_beam/io/gcp/spanner.py", "sdks/python/apache_beam/io/gcp/experimental/spannerio.py", "sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/spanner/**/*"]
"bigtable": ["sdks/go/pkg/beam/io/bigtableio/**/*", "sdks/go/pkg/beam/io/xlang/bigtableio/**/*", "sdks/python/apache_beam/io/gcp/bigtableio.py", "sdks/java/io/google-cloud-platform/src/main/java/org/apache/beam/sdk/io/gcp/bigtable/**/*"]
"synthetic": ["sdks/java/io/synthetic/**/*"]
"tests": ["sdks/java/io/file-based-io-tests/**/*"]
"thrift": ["sdks/java/io/thrift/**/*"]
Expand Down
61 changes: 61 additions & 0 deletions .github/workflows/beam_CleanUpDataprocResources.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Cleanup Dataproc Resources

on:
schedule:
- cron: '0 */6 * * *'
workflow_dispatch:

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.sender.login }}'
cancel-in-progress: true

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}

jobs:
beam_CleanUpDataprocResources:
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'schedule'
runs-on: [self-hosted, ubuntu-20.04, main]
timeout-minutes: 100
name: "beam_CleanUpDataprocResources"
steps:
- uses: actions/checkout@v3
- name: Delete leaked resources for all the jobs that generates flink clusters
run: |
cd ${{ github.workspace }}/.test-infra/dataproc; ./cleanup.sh -xe
78 changes: 78 additions & 0 deletions .github/workflows/beam_IODatastoresCredentialsRotation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Rotate IO-Datastores Cluster Credentials

on:
schedule:
- cron: '0 2 1 * *'
workflow_dispatch:

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.sender.login }}'
cancel-in-progress: true

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}

jobs:
beam_IODatastoresCredentialsRotation:
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'schedule'
runs-on: [self-hosted, ubuntu-20.04, main]
timeout-minutes: 100
name: ${{ matrix.job_name }}
strategy:
matrix:
job_name: ["beam_IODatastoresCredentialsRotation"]
job_phrase: ["N/A"]
steps:
- uses: actions/checkout@v3
- name: Setup repository
uses: ./.github/actions/setup-action
with:
comment_phrase: ${{ matrix.job_phrase }}
github_token: ${{ secrets.GITHUB_TOKEN }}
github_job: ${{ matrix.job_name }}
- name: Starting credential rotation
run: |
gcloud container clusters update io-datastores --start-credential-rotation --zone=us-central1-a --quiet
- name: Rebuilding the nodes
run: |
gcloud container clusters upgrade io-datastores --node-pool=pool-1 --zone=us-central1-a --quiet
- name: Completing the rotation
run: |
gcloud container clusters update io-datastores --complete-credential-rotation --zone=us-central1-a --quiet
# TODO: Send email to [email protected] if something went wrong during credentials rotation
68 changes: 68 additions & 0 deletions .github/workflows/beam_Java_JMH.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: Java JMH

on:
schedule:
- cron: '0 0 * * 0'
workflow_dispatch:

#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
permissions:
actions: write
pull-requests: read
checks: read
contents: read
deployments: read
id-token: none
issues: read
discussions: read
packages: read
pages: read
repository-projects: read
security-events: read
statuses: read

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.sender.login }}'
cancel-in-progress: true

env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
INFLUXDB_HOST: http://10.128.0.96:8086
INFLUXDB_DATABASE: beam_test_metrics

jobs:
beam_Java_JMH:
if: |
github.event_name == 'workflow_dispatch' ||
github.event_name == 'schedule'
runs-on: [self-hosted, ubuntu-20.04, main]
timeout-minutes: 900
name: "beam_Java_JMH"
steps:
- uses: actions/checkout@v3
- name: run the Java JMH micro-benchmark harness suite
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :sdks:java:harness:jmh:jmh
- name: run the Java JMH micro-benchmark core suite
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: :sdks:java:core:jmh:jmh
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_CoGBK_Dataflow_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: Load Tests CoGBK Dataflow Batch Go

on:
issue_comment:
types: [created]
schedule:
- cron: '40 23 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_CoGBK_Flink_batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: LoadTests Go CoGBK Flink Batch

on:
issue_comment:
types: [created]
schedule:
- cron: '10 14 * * *'
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: Load Tests Combine Dataflow Batch Go

on:
issue_comment:
types: [created]
schedule:
- cron: '40 23 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_Combine_Flink_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: LoadTests Go Combine Flink Batch

on:
issue_comment:
types: [created]
schedule:
- cron: '40 6 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_GBK_Dataflow_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: Load Tests GBK Dataflow Batch Go

on:
issue_comment:
types: [created]
schedule:
- cron: '40 23 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_GBK_Flink_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: LoadTests Go GBK Flink Batch

on:
issue_comment:
types: [created]
schedule:
- cron: '20 1 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_ParDo_Dataflow_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: Load Tests ParDo Dataflow Batch Go

on:
issue_comment:
types: [created]
schedule:
- cron: '15 18 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_ParDo_Flink_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: LoadTests Go ParDo Flink Batch

on:
issue_comment:
types: [created]
schedule:
- cron: '40 2 * * *'
workflow_dispatch:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: Load Tests SideInput Dataflow Batch Go

on:
issue_comment:
types: [created]
schedule:
- cron: '40 23 * * *'
workflow_dispatch:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/beam_LoadTests_Go_SideInput_Flink_Batch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
name: LoadTests Go SideInput Flink Batch

on:
issue_comment:
types: [created]
schedule:
- cron: '40 23 * * *'
workflow_dispatch:
Expand Down
Loading

0 comments on commit b67fe0c

Please sign in to comment.