Skip to content

Commit 9f42763

Browse files
author
darkhan.nausharipov
committed
Merge branch 'master' into issue25255-delete-account
2 parents 6b8ba1a + 04c2de6 commit 9f42763

574 files changed

Lines changed: 34554 additions & 4419 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.

‎.github/workflows/playground_backend_precommit.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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: Playground PreCommit
17+
18+
on:
19+
workflow_dispatch:
20+
pull_request:
21+
paths:
22+
- .github/workflows/playground_backend_precommit.yml
23+
- playground/backend/**
24+
jobs:
25+
precommit_check:
26+
name: precommit-check
27+
runs-on: ubuntu-latest
28+
env:
29+
DATASTORE_EMULATOR_VERSION: '389.0.0'
30+
PYTHON_VERSION: '3.8'
31+
JAVA_VERSION: '8'
32+
steps:
33+
- name: Check out the repo
34+
uses: actions/checkout@v3
35+
36+
- uses: actions/setup-python@v4
37+
with:
38+
python-version: '${{ env.PYTHON_VERSION }}'
39+
- uses: actions/[email protected]
40+
with:
41+
distribution: 'zulu'
42+
java-version: '${{ env.JAVA_VERSION }}'
43+
44+
- name: Setup Gradle
45+
uses: gradle/gradle-build-action@v2
46+
with:
47+
cache-read-only: false
48+
49+
- name: Add GOPATH/bin to PATH
50+
run: echo "PATH=$PATH:$(go env GOPATH)/bin" >> $GITHUB_ENV
51+
52+
- name: Install sbt for running SCIO tests
53+
run: |
54+
sudo apt-get update --yes
55+
sudo apt-get install apt-transport-https curl gnupg -yqq
56+
echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
57+
echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee /etc/apt/sources.list.d/sbt_old.list
58+
curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo -H gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/scalasbt-release.gpg --import
59+
sudo chmod 644 /etc/apt/trusted.gpg.d/scalasbt-release.gpg
60+
sudo apt-get update --yes
61+
sudo apt-get install sbt --yes
62+
- name: Set up Cloud SDK and its components
63+
uses: google-github-actions/setup-gcloud@v0
64+
with:
65+
install_components: 'beta,cloud-datastore-emulator'
66+
version: '${{ env.DATASTORE_EMULATOR_VERSION }}'
67+
- name: Run PreCommit
68+
run: ./gradlew playground:backend:precommit

‎.test-infra/dataproc/flink_cluster.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ set -Eeuxo pipefail
4646

4747
# GCloud properties
4848
GCLOUD_ZONE="${GCLOUD_ZONE:=us-central1-a}"
49-
# TODO: replace preview once dataproc 2.1 released
50-
DATAPROC_VERSION="${DATAPROC_VERSION:=preview-debian11}"
49+
DATAPROC_VERSION="${DATAPROC_VERSION:=2.1-debian}"
5150
GCLOUD_REGION=`echo $GCLOUD_ZONE | sed -E "s/(-[a-z])?$//"`
5251

5352
MASTER_NAME="$CLUSTER_NAME-m"

‎.test-infra/jenkins/CommonJobProperties.groovy‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ class CommonJobProperties {
6969
extensions {
7070
wipeOutWorkspace()
7171
relativeTargetDirectory(checkoutDir)
72+
cloneOptions {
73+
shallow()
74+
noTags()
75+
}
7276
if (!allowRemotePoll) {
7377
disableRemotePoll()
7478
}

‎.test-infra/jenkins/PrecommitJobBuilder.groovy‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,27 @@ class PrecommitJobBuilder {
4747
/** Whether to trigger on new PR commits. Useful to set to false when testing new jobs. */
4848
boolean commitTriggering = true
4949

50+
/**
51+
* Whether to trigger on cron run. Useful to set jobs that runs tasks covered by
52+
* other test suites but are deemed to triggered on pull request only.
53+
*/
54+
boolean cronTriggering = true
55+
56+
/**
57+
* Whether to configure defaultPathTriggers.
58+
* Set to false for PreCommit only runs on certain code path change.
59+
*/
60+
boolean defaultPathTriggering = true
61+
5062
/**
5163
* Define a set of pre-commit jobs.
5264
*
5365
* @param additionalCustomization Job DSL closure with additional customization to apply to the job.
5466
*/
5567
void build(Closure additionalCustomization = {}) {
56-
defineCronJob additionalCustomization
68+
if (cronTriggering) {
69+
defineCronJob additionalCustomization
70+
}
5771
if (commitTriggering) {
5872
defineCommitJob additionalCustomization
5973
}
@@ -82,7 +96,7 @@ class PrecommitJobBuilder {
8296
'^gradle.bat$',
8397
'^settings.gradle.kts$'
8498
]
85-
if (triggerPathPatterns) {
99+
if (defaultPathTriggering && triggerPathPatterns) {
86100
triggerPathPatterns.addAll defaultPathTriggers
87101
}
88102
job.with {

‎.test-infra/jenkins/README.md‎

Lines changed: 30 additions & 2 deletions
Large diffs are not rendered by default.

‎.test-infra/jenkins/job_PerformanceTests_MongoDBIO_IT.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ String jobName = "beam_PerformanceTests_MongoDBIO_IT"
2424

2525
job(jobName) {
2626
common.setTopLevelMainJobProperties(delegate)
27-
common.setAutoJob(delegate,'H H/6 * * *')
27+
common.setAutoJob(delegate,'H H/12 * * *')
2828
common.enablePhraseTriggeringFromPullRequest(
2929
delegate,
3030
'Java MongoDBIO Performance Test',
@@ -51,6 +51,8 @@ job(jobName) {
5151
mongoDBDatabaseName : 'beam',
5252
mongoDBHostName : "\$${mongoHostName}",
5353
mongoDBPort : 27017,
54+
mongoDBUsername : 'root',
55+
mongoDBPassword : 'uuinkkS',
5456
runner : 'DataflowRunner',
5557
autoscalingAlgorithm: 'NONE',
5658
numWorkers : '5'

‎.test-infra/jenkins/job_PostCommit_Go.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import PostcommitJobBuilder
2222
// This is the Go postcommit which runs a gradle build, and the current set
2323
// of postcommit tests.
2424
PostcommitJobBuilder.postCommitJob('beam_PostCommit_Go', 'Run Go PostCommit',
25-
'./gradlew :goPostCommit', this) {
25+
'Go PostCommit (\"Run Go PostCommit\")', this) {
2626
description('Runs Go PostCommit tests against master.')
2727
previousNames(/beam_PostCommit_Go_GradleBuild/)
2828

‎.test-infra/jenkins/job_PostCommit_Python_MongoDBIO_Load_Test.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ String jobName = "beam_python_mongoio_load_test"
2222

2323
job(jobName) {
2424
common.setTopLevelMainJobProperties(delegate)
25-
common.setAutoJob(delegate, 'H H/6 * * *')
25+
common.setAutoJob(delegate, 'H H/12 * * *')
2626
common.enablePhraseTriggeringFromPullRequest(
2727
delegate,
2828
'Python MongoDBIO Load Test',
@@ -40,7 +40,7 @@ job(jobName) {
4040
temp_location: 'gs://temp-storage-for-perf-tests/loadtests',
4141
project : 'apache-beam-testing',
4242
region : 'us-central1',
43-
mongo_uri : "mongodb://\$${mongoHostName}:27017",
43+
mongo_uri : "mongodb://root:uuinkkS@\$${mongoHostName}:27017",
4444
num_documents: '1000000',
4545
batch_size : '10000',
4646
runner : 'DataflowRunner',

‎.test-infra/jenkins/job_PreCommit_Java_Debezium_IO_Direct.groovy‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.test-infra/jenkins/job_PreCommit_Java_ElasticSearch_IO_Direct.groovy‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)