This is an automated email from the ASF dual-hosted git repository.
damccorm pushed a commit to branch revert-23160-self-hosted-java-tests
in repository https://gitbox.apache.org/repos/asf/beam.git
commit b6e42fab205994484c152c3a70511faf70365c5a
Author: Danny McCormick <dannymccorm...@google.com>
AuthorDate: Fri Dec 9 16:36:33 2022 -0500
Revert "[GitHub Actions] - Updates in Java Tests to runs-on Self-hosted
runners (#23160)"
This reverts commit 71d09d9ec5b7e9f6a16ca4462fac7dc6ed65e789.
---
.github/workflows/java_tests.yml | 51 +++++++++++++---------------------------
1 file changed, 16 insertions(+), 35 deletions(-)
diff --git a/.github/workflows/java_tests.yml b/.github/workflows/java_tests.yml
index 305b6162386..1a587e7b491 100644
--- a/.github/workflows/java_tests.yml
+++ b/.github/workflows/java_tests.yml
@@ -18,37 +18,38 @@
# To learn more about GitHub Actions in Apache Beam check the CI.md
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
+ default: false
schedule:
- cron: '10 2 * * *'
push:
branches: ['master', 'release-*']
- tags: ['v*']
+ tags: 'v*'
pull_request:
branches: ['master', 'release-*']
- tags: ['v*']
+ tags: 'v*'
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.pull_request.head.label ||
github.head_ref || github.ref }}'
cancel-in-progress: true
+
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:
- - name: Check out code
- uses: actions/checkout@v3
+ - uses: actions/checkout@v3
- name: "Check are GCP variables set"
run: "./scripts/ci/ci_check_are_gcp_variables_set.sh"
id: check_gcp_variables
@@ -66,24 +67,14 @@ 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
+ - name: Checkout code
uses: actions/checkout@v3
with:
persist-credentials: false
submodules: recursive
- - name: Install Java
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin'
- java-version: '8'
- - name: Remove default github maven configuration
- # This step is a workaround to avoid a decryption issue of Beam's
- # net.linguica.gradle.maven.settings plugin and github's provided maven
- # settings.xml file
- run: rm ~/.m2/settings.xml
- # :sdks:java:core:test
+ # :sdks:java:core:test
- name: Run :sdks:java:core:test
uses: ./.github/actions/gradle-command-action
with:
@@ -125,23 +116,13 @@ 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
+ - name: Checkout code
uses: actions/checkout@v3
with:
persist-credentials: false
submodules: recursive
- - name: Install Java
- uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: '8'
- - name: Remove default github maven configuration
- # This step is a workaround to avoid a decryption issue of Beam's
- # net.linguica.gradle.maven.settings plugin and github's provided maven
- # settings.xml file
- run: rm ~/.m2/settings.xml
- name: Install go
uses: actions/setup-go@v3
with:
@@ -172,9 +153,9 @@ 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
+ - name: Checkout code
uses: actions/checkout@v3
with:
persist-credentials: false
@@ -194,7 +175,7 @@ jobs:
uses: actions/setup-java@v3.6.0
with:
distribution: 'zulu'
- java-version: '8'
+ java-version: 8
- name: Remove default github maven configuration
# This step is a workaround to avoid a decryption issue of Beam's
# gradle-command-action plugin and github's provided maven
