Skip to content

Commit 27d2e5e

Browse files
committed
[java] Running RC tests in their own job
1 parent 9a5b98e commit 27d2e5e

File tree

3 files changed

+39
-3
lines changed

3 files changed

+39
-3
lines changed

.github/workflows/java.yml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
- name: Run browser tests in Firefox
161161
uses: ./.github/actions/bazel-test
162162
with:
163-
query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
163+
query: attr(tags, firefox, tests(//java/...)) except attr(tags, 'rc|remote', tests(//java/...))
164164
env:
165165
DISPLAY: :99
166166

@@ -196,7 +196,40 @@ jobs:
196196
- name: Run server tests
197197
uses: ./.github/actions/bazel-test
198198
with:
199-
query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
199+
query: tests(//java/...) except attr(tags, 'rc|lint|ie|edge|edgehtml|safari', tests(//java/...))
200+
env:
201+
DISPLAY: :99
202+
203+
rc_tests:
204+
needs: small_tests
205+
runs-on: ubuntu-latest
206+
steps:
207+
- name: Checkout source tree
208+
uses: actions/checkout@v2
209+
- name: Cache Bazel artifacts
210+
uses: actions/cache@v2
211+
with:
212+
path: |
213+
~/.cache/bazel-disk
214+
~/.cache/bazel-repo
215+
key: ${{ runner.os }}-bazel-firefox-tests-${{ hashFiles('**/BUILD.bazel') }}
216+
restore-keys: |
217+
${{ runner.os }}-bazel-firefox-tests-
218+
${{ runner.os }}-bazel-build-
219+
- name: Setup bazelisk
220+
uses: ./.github/actions/setup-bazelisk
221+
- name: Setup Java
222+
uses: actions/setup-java@v1
223+
with:
224+
java-version: '11'
225+
- name: Setup Firefox and GeckoDriver
226+
uses: ./.github/actions/setup-firefox
227+
- name: Start XVFB
228+
run: Xvfb :99 &
229+
- name: Run browser tests in Firefox
230+
uses: ./.github/actions/bazel-test
231+
with:
232+
query: attr(tags, rc, tests(//java/...))
200233
env:
201234
DISPLAY: :99
202235

java/test/com/thoughtworks/selenium/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ java_selenium_test_suite(
5252
"testHelpers.js",
5353
],
5454
tags = [
55-
"flaky",
55+
"rc",
5656
],
5757
test_identifiers = [
5858
"Test",

java/test/com/thoughtworks/selenium/webdriven/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ java_selenium_test_suite(
1212
"--release",
1313
"11",
1414
],
15+
tags = [
16+
"rc",
17+
],
1518
deps = [
1619
"//java/src/com/thoughtworks/selenium",
1720
"//java/src/com/thoughtworks/selenium/webdriven",

0 commit comments

Comments
 (0)