Skip to content

Commit 90e80b6

Browse files
damccormdamccorm
committed
Merge branch 'master' of https://github.com/apache/beam into users/damccorm/combinePerKey
2 parents 846d9c0 + 10a049e commit 90e80b6

File tree

46 files changed

+1724
-386
lines changed

Some content is hidden

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

46 files changed

+1724
-386
lines changed

‎.github/workflows/README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,10 @@ PostCommit Jobs run in a schedule against master branch and generally do not get
332332
| [ PostCommit Java Hadoop Versions ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Hadoop_Versions.yml) | N/A |`beam_PostCommit_Java_Hadoop_Versions.json`| [![.github/workflows/beam_PostCommit_Java_Hadoop_Versions.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Hadoop_Versions.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Hadoop_Versions.yml?query=event%3Aschedule) |
333333
| [ PostCommit Java IO Performance Tests ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml) | N/A |`beam_PostCommit_Java_IO_Performance_Tests.json`| [![.github/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_IO_Performance_Tests.yml?query=event%3Aschedule)
334334
| [ PostCommit Java InfluxDbIO Integration Test ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_InfluxDbIO_IT.yml) | N/A |`beam_PostCommit_Java_InfluxDbIO_IT.json`| [![.github/workflows/beam_PostCommit_Java_InfluxDbIO_IT.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_InfluxDbIO_IT.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_InfluxDbIO_IT.yml?query=event%3Aschedule)
335-
| [ PostCommit Java Jpms Dataflow Java11 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java11.yml) | N/A |`beam_PostCommit_Java_Jpms_Dataflow_Java11.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java11.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java11.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java11.yml?query=event%3Aschedule) |
336-
| [ PostCommit Java Jpms Dataflow Java17 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml) | N/A |`beam_PostCommit_Java_Jpms_Dataflow_Java17.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml?query=event%3Aschedule) |
337-
| [ PostCommit Java Jpms Direct Java11 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java11.yml) | N/A |`beam_PostCommit_Java_Jpms_Direct_Java11.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java11.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java11.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java11.yml?query=event%3Aschedule) |
338-
| [ PostCommit Java Jpms Direct Java17 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml) | N/A |`beam_PostCommit_Java_Jpms_Direct_Java17.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml?query=event%3Aschedule) |
339-
| [ PostCommit Java Jpms Direct Java21 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml) | N/A |`beam_PostCommit_Java_Jpms_Direct_Java21.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml?query=event%3Aschedule) |
335+
| [ PostCommit Java Jpms Dataflow ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml) | N/A |`beam_PostCommit_Java_Jpms_Dataflow.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml?query=event%3Aschedule) |
336+
| [ PostCommit Java Jpms Dataflow Versions ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Versions.yml) | N/A |`beam_PostCommit_Java_Jpms_Dataflow_Versions.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Versions.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Versions.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Dataflow_Versions.yml?query=event%3Aschedule) |
337+
| [ PostCommit Java Jpms Direct ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct.yml) | N/A |`beam_PostCommit_Java_Jpms_Direct.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Direct.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct.yml?query=event%3Aschedule) |
338+
| [ PostCommit Java Jpms Direct Versions ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Versions.yml) | N/A |`beam_PostCommit_Java_Jpms_Direct_Versions.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Direct_Versions.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Versions.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Direct_Versions.yml?query=event%3Aschedule) |
340339
| [ PostCommit Java Jpms Flink Java11 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Flink_Java11.yml) | N/A |`beam_PostCommit_Java_Jpms_Flink_Java11.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Flink_Java11.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Flink_Java11.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Flink_Java11.yml?query=event%3Aschedule) |
341340
| [ PostCommit Java Jpms Spark Java11 ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Spark_Java11.yml) | N/A |`beam_PostCommit_Java_Jpms_Spark_Java11.json`| [![.github/workflows/beam_PostCommit_Java_Jpms_Spark_Java11.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Spark_Java11.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Jpms_Spark_Java11.yml?query=event%3Aschedule) |
342341
| [ PostCommit Java Nexmark Dataflow ](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Nexmark_Dataflow.yml) | N/A |`beam_PostCommit_Java_Nexmark_Dataflow.json`| [![.github/workflows/beam_PostCommit_Java_Nexmark_Dataflow.yml](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Nexmark_Dataflow.yml/badge.svg?event=schedule)](https://github.com/apache/beam/actions/workflows/beam_PostCommit_Java_Nexmark_Dataflow.yml?query=event%3Aschedule) |

.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java11.yml renamed to .github/workflows/beam_PostCommit_Java_Jpms_Dataflow.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
name: PostCommit Java Jpms Dataflow Java11
16+
name: PostCommit Java Jpms Dataflow
1717

1818
on:
1919
schedule:
2020
- cron: '0 4/6 * * *'
2121
pull_request_target:
22-
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow_Java11.json']
22+
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow.json']
2323
workflow_dispatch:
2424

2525
#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
@@ -49,19 +49,19 @@ env:
4949
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
5050

5151
jobs:
52-
beam_PostCommit_Java_Jpms_Dataflow_Java11:
52+
beam_PostCommit_Java_Jpms_Dataflow:
5353
if: |
5454
github.event_name == 'workflow_dispatch' ||
5555
github.event_name == 'pull_request_target' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
57-
github.event.comment.body == 'Run Jpms Dataflow Java 11 PostCommit'
57+
github.event.comment.body == 'Run Jpms Dataflow PostCommit'
5858
runs-on: [self-hosted, ubuntu-20.04, main]
5959
timeout-minutes: 240
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:
6262
matrix:
63-
job_name: ["beam_PostCommit_Java_Jpms_Dataflow_Java11"]
64-
job_phrase: ["Run Jpms Dataflow Java 11 PostCommit"]
63+
job_name: ["beam_PostCommit_Java_Jpms_Dataflow"]
64+
job_phrase: ["Run Jpms Dataflow PostCommit"]
6565
steps:
6666
- uses: actions/checkout@v4
6767
- name: Setup repository
@@ -74,7 +74,7 @@ jobs:
7474
uses: ./.github/actions/setup-environment-action
7575
with:
7676
java-version: 11
77-
- name: run PostCommit Java Jpms Dataflow Java11 script
77+
- name: run PostCommit Java Jpms Dataflow script
7878
uses: ./.github/actions/gradle-command-self-hosted-action
7979
with:
8080
gradle-command: :sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest
@@ -92,4 +92,4 @@ jobs:
9292
commit: '${{ env.prsha || env.GITHUB_SHA }}'
9393
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
9494
files: '**/build/test-results/**/*.xml'
95-
large_files: true
95+
large_files: true

.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml renamed to .github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Versions.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
name: PostCommit Java Jpms Dataflow Java17
16+
name: PostCommit Java Jpms Dataflow Versions
1717

1818
on:
1919
schedule:
2020
- cron: '0 4/6 * * *'
2121
pull_request_target:
22-
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow_Java17.json']
22+
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Dataflow_Versions.json']
2323
workflow_dispatch:
2424

2525
#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
@@ -49,19 +49,20 @@ env:
4949
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
5050

5151
jobs:
52-
beam_PostCommit_Java_Jpms_Dataflow_Java17:
52+
beam_PostCommit_Java_Jpms_Dataflow_Versions:
5353
if: |
5454
github.event_name == 'workflow_dispatch' ||
5555
github.event_name == 'pull_request_target' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
57-
github.event.comment.body == 'Run Jpms Dataflow Java 17 PostCommit'
57+
github.event.comment.body == 'Run Jpms Dataflow Versions PostCommit'
5858
runs-on: [self-hosted, ubuntu-20.04, main]
5959
timeout-minutes: 240
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:
6262
matrix:
63-
job_name: ["beam_PostCommit_Java_Jpms_Dataflow_Java17"]
64-
job_phrase: ["Run Jpms Dataflow Java 17 PostCommit"]
63+
job_name: ["beam_PostCommit_Java_Jpms_Dataflow_Versions"]
64+
job_phrase: ["Run Jpms Dataflow Versions PostCommit"]
65+
java_version: ["17", "21", "25"]
6566
steps:
6667
- uses: actions/checkout@v4
6768
- name: Setup repository
@@ -74,16 +75,16 @@ jobs:
7475
uses: ./.github/actions/setup-environment-action
7576
with:
7677
java-version: |
77-
17
78+
${{ matrix.java_version }}
7879
11
79-
- name: run PostCommit Java Jpms Dataflow Java17 script
80+
- name: run PostCommit Java Jpms Dataflow Java${{ matrix.java_version }} script
8081
uses: ./.github/actions/gradle-command-self-hosted-action
8182
with:
8283
gradle-command: :sdks:java:testing:jpms-tests:dataflowRunnerIntegrationTest
8384
arguments:
8485
-PskipCheckerFramework
85-
-PtestJavaVersion=17
86-
-Pjava17Home=$JAVA_HOME_17_X64
86+
-PtestJavaVersion=${{ matrix.java_version }}
87+
-Pjava${{ matrix.java_version }}Home=$JAVA_HOME_${{ matrix.java_version }}_X64
8788
- name: Archive JUnit Test Results
8889
uses: actions/upload-artifact@v4
8990
if: ${{ !success() }}
@@ -97,4 +98,4 @@ jobs:
9798
commit: '${{ env.prsha || env.GITHUB_SHA }}'
9899
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
99100
files: '**/build/test-results/**/*.xml'
100-
large_files: true
101+
large_files: true

.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java11.yml renamed to .github/workflows/beam_PostCommit_Java_Jpms_Direct.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
name: PostCommit Java Jpms Direct Java11
16+
name: PostCommit Java Jpms Direct
1717

1818
on:
1919
schedule:
2020
- cron: '0 4/6 * * *'
2121
pull_request_target:
22-
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Direct_Java11.json']
22+
paths: ['release/trigger_all_tests.json', '.github/trigger_files/beam_PostCommit_Java_Jpms_Direct.json']
2323
workflow_dispatch:
2424

2525
#Setting explicit permissions for the action to avoid the default permissions which are `write-all` in case of pull_request_target event
@@ -49,19 +49,19 @@ env:
4949
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
5050

5151
jobs:
52-
beam_PostCommit_Java_Jpms_Direct_Java11:
52+
beam_PostCommit_Java_Jpms_Direct:
5353
if: |
5454
github.event_name == 'workflow_dispatch' ||
5555
github.event_name == 'pull_request_target' ||
5656
(github.event_name == 'schedule' && github.repository == 'apache/beam') ||
57-
github.event.comment.body == 'Run Jpms Direct Java 11 PostCommit'
57+
github.event.comment.body == 'Run Jpms Direct PostCommit'
5858
runs-on: [self-hosted, ubuntu-20.04, main]
5959
timeout-minutes: 240
6060
name: ${{ matrix.job_name }} (${{ matrix.job_phrase }})
6161
strategy:
6262
matrix:
63-
job_name: ["beam_PostCommit_Java_Jpms_Direct_Java11"]
64-
job_phrase: ["Run Jpms Direct Java 11 PostCommit"]
63+
job_name: ["beam_PostCommit_Java_Jpms_Direct"]
64+
job_phrase: ["Run Jpms Direct PostCommit"]
6565
steps:
6666
- uses: actions/checkout@v4
6767
- name: Setup repository
@@ -74,11 +74,10 @@ jobs:
7474
uses: ./.github/actions/setup-environment-action
7575
with:
7676
java-version: 11
77-
- name: run PostCommit Java Jpms Direct Java11 script
77+
- name: run PostCommit Java Jpms Direct script
7878
uses: ./.github/actions/gradle-command-self-hosted-action
7979
with:
8080
gradle-command: :sdks:java:testing:jpms-tests:directRunnerIntegrationTest
81-
arguments: -Dorg.gradle.java.home=$JAVA_HOME_11_X64
8281
- name: Archive JUnit Test Results
8382
uses: actions/upload-artifact@v4
8483
if: ${{ !success() }}
@@ -92,4 +91,4 @@ jobs:
9291
commit: '${{ env.prsha || env.GITHUB_SHA }}'
9392
comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }}
9493
files: '**/build/test-results/**/*.xml'
95-
large_files: true
94+
large_files: true

‎.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml‎

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

0 commit comments

Comments
 (0)