Merge branch 'refactor/simplify-project-structure' into test/validati…

…on-workflow
mcollovati · Dec 26, 2023 · a74cf1e · a74cf1e
2 parents da4e3f4 + da9c6f2
commit a74cf1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -249,9 +249,7 @@ jobs:
         run: |
           set -x -e -o pipefail
           cd vertx-vaadin-tests/test-frontend
-          mvn -V -e -B -ntp verify -Dmaven.javadoc.skip=false -DtrimStackTrace=false \
-            -Dtest.vertx.jvmArgs='-Dorg.slf4j.simpleLogger.logFile=target/verticle.log -Dvaadin.require.home.node=true -Xmx2048M -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory' \
-            -Dwebdriver.chrome.driver=$(which chromedriver)
+          mvn -V -e -B -ntp verify -Dmaven.javadoc.skip=false -DtrimStackTrace=false -Dwebdriver.chrome.driver=$(which chromedriver)
       - name: Dump threads
         if: ${{ cancelled() }}
         run: |
@@ -266,6 +264,10 @@ jobs:
             echo
             echo
           done
+      - name: Print verticle.log
+        #if: ${{ failure() || success() }}
+        if: ${{ always() }}
+        run: find . -name verticle.log -exec cat {}\;
       - name: Package test output files
         #if: ${{ failure() || success() }}
         if: ${{ always() }}

diff --git a/vertx-vaadin-tests/test-frontend/pom.xml b/vertx-vaadin-tests/test-frontend/pom.xml
@@ -51,6 +51,12 @@
                     <configuration>
                         <config>${project.basedir}/src/test/conf/vertx-vaadin-test.conf</config>
                         <verticle>com.vaadin.flow.uitest.vertx.TestBootVerticle</verticle>
+                        <jvmArgs>
+                            <jvmArg>-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory</jvmArg>
+                            <jvmArg>-Dorg.slf4j.simpleLogger.logFile=target/verticle.log</jvmArg>
+                            <jvmArg>-Dvaadin.require.home.node=true</jvmArg>
+                            <jvmArg>-Xmx2048M</jvmArg>
+                        </jvmArgs>
                         <!--
                         <jvmArgs>
                             <jvmArg>-Dvaadin.project.basedir=${project.basedir}</jvmArg>