[ci] remove duplicate tests that are now run in RBE build

SeleniumHQ · Oct 5, 2023 · 26f0dd5 · 26f0dd5
1 parent d13ac33
commit 26f0dd5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 68 deletions.
diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
@@ -22,79 +22,38 @@ jobs:
  cache-key: java-doc
  run: ./go --verbose javadocs
 
- lint:
- name: Lint
- needs: build
- uses: ./.github/workflows/bazel.yml
- with:
- name: Lint
- cache-key: java-lint
- run: bazel test --test_tag_filters "lint,-no-lint" //java/...
-
- small-tests:
- name: Small Tests
- needs: build
- uses: ./.github/workflows/bazel.yml
- with:
- name: Small Tests
- cache-key: java-small-tests
- run: bazel test --test_size_filters "small" --test_tag_filters "-lint" //java/...
-
- medium-tests:
- name: Medium Tests
- needs: small-tests
- uses: ./.github/workflows/bazel.yml
- with:
- name: Medium Tests
- cache-key: java-medium-tests
- run: bazel test --test_size_filters "medium" --test_tag_filters "-lint" --flaky_test_attempts 3 //java/...
-
  browser-tests:
  name: Browser Tests
- needs: small-tests
+ needs: build
  uses: ./.github/workflows/bazel.yml
  strategy:
  fail-fast: false
  matrix:
  include:
- - browser: chrome
- browser-version: stable
- - browser: firefox
- browser-version: latest
- - browser: firefox
- browser-version: latest-beta
- - browser: firefox
- browser-version: latest-devedition
+ - os: windows
+ - os: macos
  with:
- name: Browser Tests (${{ matrix.browser }}, ${{ matrix.browser-version }})
- browser: ${{ matrix.browser }}
- browser-version: ${{ matrix.browser-version }}
- cache-key: java-${{ matrix.browser }}-tests
+ name: Browser Tests (chrome, ${{ matrix.os }})
+ os: ${{ matrix.os }}
+ browser: chrome
+ cache-key: java-${{ matrix.os }}-tests
  run: >
- bazel query "attr(tags, ${{ matrix.browser }}, tests(//java/...)) except attr(tags, 'rc|remote', tests(//java/...))" |
- xargs bazel test --flaky_test_attempts 3
+ bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest
 
  remote-tests:
  name: Remote Tests
- needs: small-tests
+ needs: build
  uses: ./.github/workflows/bazel.yml
  strategy:
  fail-fast: false
  matrix:
  include:
- - browser: chrome
- browser-version: stable
- - browser: firefox
- browser-version: latest
- - browser: firefox
- browser-version: latest-beta
- - browser: firefox
- browser-version: latest-devedition
+ - os: windows
+ - os: macos
  with:
- name: Remote Tests (${{ matrix.browser }}, ${{ matrix.browser-version }})
- browser: ${{ matrix.browser }}
- browser-version: ${{ matrix.browser-version }}
- cache-key: java-${{ matrix.browser }}-remote-tests
+ name: Remote Tests (chrome, ${{ matrix.os }})
+ os: ${{ matrix.os }}
+ browser: chrome
+ cache-key: java-${{ matrix.os }}-remote-tests
  run: >
- bazel query "attr(tags, ${{ matrix.browser }}, tests(//java/...)) intersect attr(tags, 'remote', tests(//java/...))" |
- xargs bazel test --flaky_test_attempts 3
+ bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -77,18 +77,9 @@ jobs:
  env:
  TOXENV: mypy
 
- unit-tests:
- name: Unit Tests
- needs: build
- uses: ./.github/workflows/bazel.yml
- with:
- name: Unit Tests
- cache-key: py-unit
- run: bazel test //py:unit
-
  browser-tests:
  name: Browser Tests
- needs: unit-tests
+ needs: build
  uses: ./.github/workflows/bazel.yml
  strategy:
  fail-fast: false
@@ -104,7 +95,7 @@ jobs:
 
  remote-tests:
  name: Remote Tests
- needs: unit-tests
+ needs: build
  uses: ./.github/workflows/bazel.yml
  with:
  name: Integration Tests (remote)