Support DataStream batch for portable flink runner and run validation runner tests #37133
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| # 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: PostCommit Java PVR Flink Batch | ||
|
|
||
| on: | ||
| push: | ||
| tags: ['v*'] | ||
| branches: ['master', 'release-*'] | ||
| paths: | ||
| - 'runners/flink/**' | ||
| - 'runners/java-fn-execution/**' | ||
| - 'sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/**' | ||
| - '.github/workflows/beam_PostCommit_Java_PVR_Flink_Batch.yml' | ||
| pull_request_target: | ||
| branches: ['master', 'release-*'] | ||
| paths: | ||
| - 'release/trigger_all_tests.json' | ||
| - '.github/trigger_files/beam_PostCommit_Java_PVR_Flink_Batch.json' | ||
| schedule: | ||
| - cron: '15 2/6 * * *' | ||
| workflow_dispatch: | ||
|
|
||
| # This allows a subsequently queued workflow run to interrupt previous runs | ||
| concurrency: | ||
| group: '${{ github.workflow }} @ ${{ github.event.issue.number || github.event.pull_request.head.label || github.sha || github.head_ref || github.ref }}-${{ github.event.schedule || github.event.comment.id || github.event.sender.login }}' | ||
| cancel-in-progress: true | ||
|
|
||
| #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: write | ||
| checks: write | ||
| contents: read | ||
| deployments: read | ||
| id-token: none | ||
| issues: write | ||
| discussions: read | ||
| packages: read | ||
| pages: read | ||
| repository-projects: read | ||
| security-events: read | ||
| statuses: read | ||
|
|
||
| env: | ||
| DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} | ||
| GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }} | ||
| GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }} | ||
|
|
||
| jobs: | ||
| beam_PostCommit_Java_PVR_Flink_Batch: | ||
| name: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) | ||
| strategy: | ||
| matrix: | ||
| job_name: ["beam_PostCommit_Java_PVR_Flink_Batch"] | ||
| job_phrase: ["Run Java_PVR_Flink_Batch PostCommit"] | ||
| timeout-minutes: 240 | ||
| runs-on: [self-hosted, ubuntu-20.04, highmem] | ||
| if: | | ||
| github.event_name == 'push' || | ||
| github.event_name == 'pull_request_target' || | ||
| (github.event_name == 'schedule' && github.repository == 'apache/beam') || | ||
| github.event_name == 'workflow_dispatch' || | ||
| github.event.comment.body == 'Run Java_PVR_Flink_Batch PostCommit' | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Setup repository | ||
| uses: ./.github/actions/setup-action | ||
| with: | ||
| comment_phrase: ${{ matrix.job_phrase }} | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| github_job: ${{ matrix.job_name }} (${{ matrix.job_phrase }}) | ||
| - name: Setup environment | ||
| uses: ./.github/actions/setup-environment-action | ||
| - name: run validatesPortableRunnerBatch script | ||
| uses: ./.github/actions/gradle-command-self-hosted-action | ||
| with: | ||
| gradle-command: :runners:flink:1.20:job-server:validatesPortableRunnerBatchDataSet | ||
| env: | ||
| CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH }} | ||
| - name: Archive JUnit Test Results | ||
| uses: actions/upload-artifact@v4 | ||
| if: ${{ !success() }} | ||
| with: | ||
| name: JUnit Test Results | ||
| path: "**/build/reports/tests/" | ||
| - name: Upload test report | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: java-code-coverage-report | ||
| path: "**/build/test-results/**/*.xml" | ||
| # TODO: Investigate 'Max retries exceeded' issue with EnricoMi/publish-unit-test-result-action@v2. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,15 +53,19 @@ task copyDockerfileDependencies(type: Copy) { | |
| } | ||
|
|
||
| def pushContainers = project.rootProject.hasProperty(["isRelease"]) || project.rootProject.hasProperty("push-containers") | ||
| def containerName = project.parent.name.startsWith("2") ? "flink_job_server" : "flink${project.parent.name}_job_server" | ||
|
Contributor
There was a problem hiding this comment. Why do we no longer need a separate container with flink 2?
Contributor
There was a problem hiding this comment. Oh I see - you're moving to a tag approach. Maybe we could just do this generally for all versions? It would be nice to not need a new container each time
Contributor
Author
There was a problem hiding this comment. Sorry, this is part of #31631 (updated PR description now). Also noted there I intended to make this change in new Flink (major) version to avoid breaking existing users. |
||
| def containerTag = project.rootProject.hasProperty(["docker-tag"]) ? project.rootProject["docker-tag"] : project.sdk_version | ||
| if (project.parent.name.startsWith("2")) { | ||
| containerTag += "-flink${project.parent.name}" | ||
| } | ||
|
|
||
| docker { | ||
| name containerImageName( | ||
| name: project.docker_image_default_repo_prefix + containerName, | ||
| root: project.rootProject.hasProperty(["docker-repository-root"]) ? | ||
| project.rootProject["docker-repository-root"] : | ||
| project.docker_image_default_repo_root, | ||
| tag: containerTag) | ||
| // tags used by dockerTag task | ||
| tags containerImageTags() | ||
| files "./build/" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why does order matter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For file A.java in flink/1.18/src, it is consumed by flink/1.18, flink1.19, flink1.20,...
If in Flink 1.19 it needs to be overriden again, this order makes sure that flink1.20 is consuming A.java in flink/1.19 dir