Skip to content

Commit

Permalink
new cross-language task+configuration with input expansion service an…
Browse files Browse the repository at this point in the history
…d python collect marker
  • Loading branch information
ahmedabu98 committed Mar 1, 2023
1 parent 797a526 commit 95f8f87
Show file tree
Hide file tree
Showing 318 changed files with 12,637 additions and 2,308 deletions.
8 changes: 4 additions & 4 deletions .github/actions/setup-self-hosted-action/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ inputs:
required: false
description: 'Set as false if does not require java-8 setup'
default: 'true'
requires-go-18:
requires-go-19:
required: false
description: 'Set as false if does not require go-18 setup'
description: 'Set as false if does not require go-19 setup'
default: 'true'

runs:
Expand Down Expand Up @@ -64,7 +64,7 @@ runs:
distribution: 'temurin'
java-version: 8
- name: Set Go Version
if: ${{ inputs.requires-go-18 == 'true' }}
if: ${{ inputs.requires-go-19 == 'true' }}
uses: actions/setup-go@v3
with:
go-version: '1.18.0'
go-version: '1.19.0'
2 changes: 1 addition & 1 deletion .github/workflows/build_playground_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
name: Build Playground Frontend App
runs-on: [self-hosted, ubuntu-20.04]
env:
GO_VERSION: 1.18.0
GO_VERSION: 1.19.6
BEAM_VERSION: 2.40.0
TERRAFORM_VERSION: 1.0.9
FLUTTER_VERSION: 3.3.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git_tag_released_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ on:

jobs:
generate_tags:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
env:
VERSION_PATH: ${{ github.event.inputs.VERSION_TAG }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ concurrency:
cancel-in-progress: true
jobs:
build:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
name: Go Build
steps:
- name: Check out code
Expand All @@ -44,7 +44,7 @@ jobs:
fetch-depth: 2
- uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.19'
- name: Delete old coverage
run: "cd sdks/go/pkg && rm -rf .coverage || :"
- name: Run coverage
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-tagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

jobs:
label:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
permissions:
issues: write
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/java_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
check_gcp_variables:
timeout-minutes: 5
name: "Check GCP variables set"
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
outputs:
gcp-variables-set: ${{ steps.check_gcp_variables.outputs.gcp-variables-set }}
steps:
Expand All @@ -66,7 +66,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [[self-hosted, ubuntu-20.04], macos-latest, [self-hosted, windows-server-2019]]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [[self-hosted, ubuntu-20.04], macos-latest, [self-hosted, windows-server-2019]]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [[self-hosted, ubuntu-20.04],[self-hosted, windows-server-2019]]
os: [ubuntu-latest,windows-latest]
if: |
needs.check_gcp_variables.outputs.gcp-variables-set == 'true' && (
(github.event_name == 'push' || github.event_name == 'schedule') ||
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label_prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on: [pull_request_target]
permissions: read-all
jobs:
label:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
permissions:
contents: read
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playground_deploy_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
name: Build Playground Backend App
runs-on: ubuntu-latest
env:
GO_VERSION: 1.18.0
GO_VERSION: 1.19.6
BEAM_VERSION: 2.40.0
TERRAFORM_VERSION: 1.0.9
STAND_SUFFIX: ''
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-bot-new-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
statuses: read
# Don't run on forks
if: github.repository == 'apache/beam'
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-bot-pr-updates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# Don't run on forks
if: github.repository == 'apache/beam'
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest

steps:
# Pin to master so users can't do anything malicious on their own branch and run it here.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-bot-prs-needing-attention.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
statuses: read
# Don't run on forks
if: github.repository == 'apache/beam'
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Node
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish_github_release_notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ permissions: read-all

jobs:
set-properties:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
outputs:
properties: ${{ steps.test-properties.outputs.properties }}
steps:
Expand All @@ -41,7 +41,7 @@ jobs:
uses: ./.github/actions/setup-default-test-properties

publish_github_release_notes:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
needs: set-properties
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v3
with:
go-version: '1.18'
go-version: '1.19'
- name: Download source from artifacts
uses: actions/download-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reportGenerator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
jobs:
assign:
name: Generate issue report
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Node
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/self-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
issues: write
name: Take or close an issue
if: ${{ !github.event.issue.pull_request }}
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
permissions: read-all
jobs:
stale:
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/triaged-on-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
permissions:
issues: write
name: Mark issue as triaged when assigned
runs-on: [self-hosted, ubuntu-20.04]
runs-on: ubuntu-latest
steps:
- run: |
ISSUE_NUMBER="$(jq '.issue.number' $GITHUB_EVENT_PATH)"
Expand Down
3 changes: 1 addition & 2 deletions .test-infra/dataproc/flink_cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ set -Eeuxo pipefail

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

MASTER_NAME="$CLUSTER_NAME-m"
Expand Down
4 changes: 4 additions & 0 deletions .test-infra/jenkins/CommonJobProperties.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class CommonJobProperties {
extensions {
wipeOutWorkspace()
relativeTargetDirectory(checkoutDir)
cloneOptions {
shallow()
noTags()
}
if (!allowRemotePoll) {
disableRemotePoll()
}
Expand Down
18 changes: 16 additions & 2 deletions .test-infra/jenkins/PrecommitJobBuilder.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,27 @@ class PrecommitJobBuilder {
/** Whether to trigger on new PR commits. Useful to set to false when testing new jobs. */
boolean commitTriggering = true

/**
* Whether to trigger on cron run. Useful to set jobs that runs tasks covered by
* other test suites but are deemed to triggered on pull request only.
*/
boolean cronTriggering = true

/**
* Whether to configure defaultPathTriggers.
* Set to false for PreCommit only runs on certain code path change.
*/
boolean defaultPathTriggering = true

/**
* Define a set of pre-commit jobs.
*
* @param additionalCustomization Job DSL closure with additional customization to apply to the job.
*/
void build(Closure additionalCustomization = {}) {
defineCronJob additionalCustomization
if (cronTriggering) {
defineCronJob additionalCustomization
}
if (commitTriggering) {
defineCommitJob additionalCustomization
}
Expand Down Expand Up @@ -82,7 +96,7 @@ class PrecommitJobBuilder {
'^gradle.bat$',
'^settings.gradle.kts$'
]
if (triggerPathPatterns) {
if (defaultPathTriggering && triggerPathPatterns) {
triggerPathPatterns.addAll defaultPathTriggers
}
job.with {
Expand Down
Loading

0 comments on commit 95f8f87

Please sign in to comment.