Skip to content

Commit

Permalink
Clean up Java Tests GitHub workflow (apache#33354)
Browse files Browse the repository at this point in the history
* Remove use of static credentials

* Stage for adding back dataflow

* Remove unnecessary dataflow test
  • Loading branch information
damondouglas authored Dec 13, 2024
1 parent 011ec94 commit f92dde1
Showing 1 changed file with 2 additions and 70 deletions.
72 changes: 2 additions & 70 deletions .github/workflows/java_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
name: Java Tests
on:
workflow_dispatch:
inputs:
runDataflow:
description: 'Type "true" if you want to run Dataflow tests (GCP variables must be configured, check CI.md)'
default: 'false'
required: false

schedule:
- cron: '10 2 * * *'
push:
Expand All @@ -33,8 +29,7 @@ on:
pull_request:
branches: ['master', 'release-*']
tags: ['v*']
paths: ['sdks/java/**', 'model/**', 'runners/**', 'examples/java/**',
'examples/kotlin/**', 'release/**', 'buildSrc/**']
paths: ['sdks/java/**', 'model/**', 'runners/**', 'examples/java/**', 'examples/kotlin/**', 'release/**', 'buildSrc/**']
# 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}}'
Expand All @@ -44,26 +39,6 @@ env:
GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GE_CACHE_USERNAME }}
GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GE_CACHE_PASSWORD }}
jobs:
check_gcp_variables:
timeout-minutes: 5
name: "Check GCP variables set"
runs-on: [self-hosted, ubuntu-20.04, main]
outputs:
gcp-variables-set: ${{ steps.check_gcp_variables.outputs.gcp-variables-set }}
steps:
- name: Check out code
uses: actions/checkout@v4
- name: "Check are GCP variables set"
run: "./scripts/ci/ci_check_are_gcp_variables_set.sh"
id: check_gcp_variables
env:
GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
GCP_SA_EMAIL: ${{ secrets.GCP_SA_EMAIL }}
GCP_SA_KEY: ${{ secrets.GCP_SA_KEY }}
GCP_TESTING_BUCKET: ${{ secrets.GCP_TESTING_BUCKET }}
GCP_REGION: "not-needed-here"
GCP_PYTHON_WHEELS_BUCKET: "not-needed-here"

java_unit_tests:
name: 'Java Unit Tests'
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -152,46 +127,3 @@ jobs:
with:
name: java_wordcount_direct_runner-${{matrix.os}}
path: examples/java/build/reports/tests/integrationTest

java_wordcount_dataflow:
name: 'Java Wordcount Dataflow'
needs:
- check_gcp_variables
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [[self-hosted, ubuntu-20.04, main], windows-latest]
# TODO(https://github.com/apache/beam/issues/31848) run on Dataflow after fixes credential on macOS/win GHA runner
if: |
needs.check_gcp_variables.outputs.gcp-variables-set == 'true' &&
(github.event_name == 'workflow_dispatch' && github.event.inputs.runDataflow == 'true')
steps:
- name: Check out code
uses: actions/checkout@v4
with:
persist-credentials: false
submodules: recursive
- name: Setup environment
uses: ./.github/actions/setup-environment-action
with:
java-version: 11
go-version: default
- name: Authenticate on GCP
uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}
project_id: ${{ secrets.GCP_PROJECT_ID }}
- name: Run WordCount
uses: ./.github/actions/gradle-command-self-hosted-action
with:
gradle-command: integrationTest
arguments: -p examples/ --tests org.apache.beam.examples.WordCountIT
-DintegrationTestPipelineOptions=[\"--runner=DataflowRunner\",\"--project=${{ secrets.GCP_PROJECT_ID }}\",\"--tempRoot=gs://${{ secrets.GCP_TESTING_BUCKET }}/tmp/\"]
-DintegrationTestRunner=dataflow
- name: Upload test logs
uses: actions/upload-artifact@v4
if: always()
with:
name: java_wordcount_dataflow-${{matrix.os}}
path: examples/java/build/reports/tests/integrationTest

0 comments on commit f92dde1

Please sign in to comment.