From 3b7b8fa13240867b6651605302cb4b917ce56214 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 1 Jun 2023 10:16:22 +0200
Subject: [PATCH] Use Chrome as the default JavaScript browser (#14702)
 (#20701)

* Use Chrome as the default JavaScript browser (#14702)

* Sync changes to ci.yml from main

---------

Co-authored-by: Jon Koops <jonkoops@gmail.com>
---
 .github/workflows/ci.yml                      | 76 +------------------
 .../integration-arquillian/tests/pom.xml      |  2 +-
 2 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 226b6a6c1a3..4c8f91064a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,14 +76,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: '**/target/surefire-reports/*.xml'
-
   base-integration-tests:
     name: Base IT
     needs: build
@@ -104,20 +96,12 @@ jobs:
         run: |
           TESTS=`testsuite/integration-arquillian/tests/base/testsuites/base-suite.sh ${{ matrix.group }}`
           echo "Tests: $TESTS"
-          ./mvnw test -Dsurefire.rerunFailingTestsCount=${{ env.SUREFIRE_RERUN_FAILING_COUNT }} -nsu -B -Pauth-server-quarkus -Dtest=$TESTS -pl testsuite/integration-arquillian/tests/base | misc/log/trimmer.sh
+          ./mvnw test -Dsurefire.rerunFailingTestsCount=${{ env.SUREFIRE_RERUN_FAILING_COUNT }} -nsu -B -Pauth-server-quarkus "-Dwebdriver.chrome.driver=$CHROMEWEBDRIVER/chromedriver" -Dtest=$TESTS -pl testsuite/integration-arquillian/tests/base | misc/log/trimmer.sh
 
       - name: Upload JVM Heapdumps
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
@@ -158,14 +142,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'quarkus/tests/integration/target/surefire-reports/*.xml'
-
   jdk-integration-tests:
     name: Java Distribution IT
     needs: build
@@ -203,14 +179,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
@@ -267,14 +235,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
@@ -286,7 +246,7 @@ jobs:
     name: Legacy Store IT
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       matrix:
         db: [postgres, mysql, oracle, mssql, mariadb]
@@ -308,14 +268,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
@@ -371,14 +323,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
@@ -413,14 +357,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: '**/target/surefire-reports/*.xml'
-
   fips-integration-tests:
     name: FIPS IT
     needs: build
@@ -455,14 +391,6 @@ jobs:
         if: always()
         uses: ./.github/actions/upload-heapdumps
 
-      - id: upload-surefire-reports
-        name: Upload Surefire reports
-        uses: ./.github/actions/upload-surefire-reports
-        if: always()
-        with:
-          api-key: ${{ secrets.FORESIGHT_API_KEY }}
-          surefire-reports-path: 'testsuite/integration-arquillian/tests/base/target/surefire-reports/*.xml'
-
       - uses: ./.github/actions/upload-flaky-tests
         name: Upload flaky tests
         env:
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index ee4211367c1..891a604c4a1 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -215,7 +215,7 @@
         <github.secretToken/>
         <ieDriverArch>Win32</ieDriverArch>
         <ieDriverVersion/>
-        <js.browser>phantomjs</js.browser>
+        <js.browser>chrome</js.browser>
         <js.chromeArguments>--headless</js.chromeArguments>
         <htmlUnitBrowserVersion>chrome</htmlUnitBrowserVersion>
         <firefox_binary/> <!-- the path is set automatically based on the OS -->