From 4f4a58a2325e6517dd27ffc8548f825a1de9079f Mon Sep 17 00:00:00 2001 From: Andrey Devyatkin Date: Thu, 19 Oct 2023 16:39:41 +0200 Subject: [PATCH] fix workflows (#29009) --- ...Commit_Java_ValidatesRunner_Dataflow_JavaVersions.yml | 8 +++----- .../beam_PostCommit_Java_ValidatesRunner_Direct.yml | 4 +--- ...stCommit_Java_ValidatesRunner_Direct_JavaVersions.yml | 8 +++----- .../beam_PostCommit_Java_ValidatesRunner_Flink.yml | 1 + ...beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml | 9 ++++----- ...beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml | 8 +++----- .../beam_PostCommit_Java_ValidatesRunner_ULR.yml | 4 +--- .../workflows/beam_PostCommit_Python_Examples_Flink.yml | 2 +- ...eam_PostCommit_Python_ValidatesContainer_Dataflow.yml | 4 +++- ...Commit_Python_ValidatesContainer_Dataflow_With_RC.yml | 4 +++- 10 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml index 67bc4e6a3994..a6afa04f565d 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml @@ -79,11 +79,9 @@ jobs: ${{ matrix.java_version }} 8 - name: run jar Java${{ matrix.java_version }} script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar - arguments: | - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 \ + run: | + ./gradlew runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar \ + -Dorg.gradle.java.home=$JAVA_HOME_8_X64 - name: run validatesRunner Java${{ matrix.java_version }} script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct.yml index af7a4379ad5e..cf62a7894658 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct.yml @@ -75,9 +75,7 @@ jobs: distribution: 'zulu' java-version: '8' - name: run validatesRunner script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:direct-java:validatesRunner + run: ./gradlew :runners:direct-java:validatesRunner - name: Archive JUnit Test Results uses: actions/upload-artifact@v3 if: failure() diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml index c9da0d7bd604..2d879fa7d631 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml @@ -79,11 +79,9 @@ jobs: ${{ matrix.java_version }} 8 - name: run jar Java${{ matrix.java_version }} script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar - arguments: | - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 \ + run: | + ./gradlew :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar \ + -Dorg.gradle.java.home=$JAVA_HOME_8_X64 - name: run validatesRunner Java${{ matrix.java_version }} script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml index 7202b6fa33ae..03dd89592a73 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink.yml @@ -86,6 +86,7 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@v2 if: always() with: + large_files: true commit: '${{ env.prsha || env.GITHUB_SHA }}' comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }} files: '**/build/test-results/**/*.xml' \ No newline at end of file diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml index 2f2e4f15abe6..e96f8efb9aeb 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml @@ -77,11 +77,9 @@ jobs: 11 8 - name: run jar Java8 script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:flink:1.15:jar :runners:flink:1.15:testJar - arguments: | - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 \ + run: | + ./gradlew :runners:flink:1.15:jar :runners:flink:1.15:testJar \ + -Dorg.gradle.java.home=$JAVA_HOME_8_X64 - name: run validatesRunner Java11 script uses: ./.github/actions/gradle-command-self-hosted-action with: @@ -107,6 +105,7 @@ jobs: uses: EnricoMi/publish-unit-test-result-action@v2 if: always() with: + large_files: true commit: '${{ env.prsha || env.GITHUB_SHA }}' comment_mode: ${{ github.event_name == 'issue_comment' && 'always' || 'off' }} files: '**/build/test-results/**/*.xml' \ No newline at end of file diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml index cc9f51113124..1f82a4568274 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml @@ -77,11 +77,9 @@ jobs: 11 8 - name: run jar Java8 script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:spark:3:jar :runners:spark:3:testJar - arguments: | - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 \ + run: | + ./gradlew :runners:spark:3:jar :runners:spark:3:testJar \ + -Dorg.gradle.java.home=$JAVA_HOME_8_X64 - name: run validatesRunner Java11 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_ULR.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_ULR.yml index 9ce3655c6fc9..9d42ecda4f38 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_ULR.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_ULR.yml @@ -77,9 +77,7 @@ jobs: with: python-version: '3.8' - name: run ulrLoopbackValidatesRunner script - uses: ./.github/actions/gradle-command-self-hosted-action - with: - gradle-command: :runners:portability:java:ulrLoopbackValidatesRunner + run: ./gradlew :runners:portability:java:ulrLoopbackValidatesRunner - name: Archive JUnit Test Results uses: actions/upload-artifact@v3 if: failure() diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml b/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml index 46df55646776..2e4db6192501 100644 --- a/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml +++ b/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml @@ -53,7 +53,7 @@ jobs: github.event_name == 'workflow_dispatch' || startsWith(github.event.comment.body, 'Run Python Examples_Flink') runs-on: [self-hosted, ubuntu-20.04, main] - timeout-minutes: 120 + timeout-minutes: 240 name: ${{ matrix.job_name }} (${{ matrix.job_phrase }} ${{ matrix.python_version }}) strategy: fail-fast: false diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml index 1bd547ab3774..51b22fa66a0e 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml @@ -72,7 +72,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: 8 + java-version: | + 11 + 8 python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml index 2c1b1c45227a..33fa6b53e23f 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml @@ -72,7 +72,9 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: 8 + java-version: | + 11 + 8 python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean