From a7712adfbcf6e00ea6a8bc8bc5b4c898055abb97 Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Sun, 11 Apr 2021 21:06:16 +0200 Subject: [PATCH] CI: Introduce COMMON_MAVEN_ARGS with --fail-at-end --- .github/workflows/ci-actions-incremental.yml | 31 ++++++++++---------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml index 08abb0c6b7904..a7cc3f9c02a3f 100644 --- a/.github/workflows/ci-actions-incremental.yml +++ b/.github/workflows/ci-actions-incremental.yml @@ -33,9 +33,10 @@ on: env: # Workaround testsuite locale issue LANG: en_US.UTF-8 - NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs" - WINDOWS_NATIVE_TEST_MAVEN_OPTS: "-B --settings .github/mvn-settings.xml --fail-at-end -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs" - JVM_TEST_MAVEN_OPTS: "-e -B --settings .github/mvn-settings.xml -Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs" + COMMON_MAVEN_ARGS: "-e -B --settings .github/mvn-settings.xml --fail-at-end" + NATIVE_TEST_MAVEN_OPTS: "-Dquarkus.native.container-build=true -Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs" + WINDOWS_NATIVE_TEST_MAVEN_OPTS: "-Dtest-containers -Dstart-containers -Dquarkus.native.native-image-xmx=5g -Dnative -Dnative.surefire.skip -Dformat.skip -Dno-descriptor-tests install -DskipDocs" + JVM_TEST_MAVEN_OPTS: "-Dtest-containers -Dstart-containers -Dformat.skip -DskipDocs" DB_USER: hibernate_orm_test DB_PASSWORD: hibernate_orm_test DB_NAME: hibernate_orm_test @@ -113,7 +114,7 @@ jobs: # note: '-Pincremental -Dgib.disable' shall only trigger the download of gitflow-incremental-builder, not activate it # since -Dincremental deactivates dependencies in bom-descriptor-json (which we do need here), -P is used instead run: | - mvn -T1C -e -B -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks -Pincremental -Dgib.disable --settings .github/mvn-settings.xml clean install + mvn -T1C $COMMON_MAVEN_ARGS -DskipTests -DskipITs -Dinvoker.skip -Dno-format -Dtcks -Pincremental -Dgib.disable clean install - name: Verify extension dependencies shell: bash run: | @@ -230,7 +231,7 @@ jobs: run: tar -xzf maven-repo.tgz -C ~ - name: Build shell: bash - run: mvn $JVM_TEST_MAVEN_OPTS install -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools ${{ matrix.java.maven_args }} ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -281,7 +282,7 @@ jobs: run: tar -xzf maven-repo.tgz -C ~ - name: Build shell: bash - run: mvn -B --settings .github/mvn-settings.xml -DskipDocs -Dformat.skip -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS -DskipDocs -Dformat.skip -Dsurefire.timeout=600 -pl !integration-tests/gradle -pl !integration-tests/maven -pl !integration-tests/devtools install ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -338,7 +339,7 @@ jobs: with: java-version: ${{ matrix.java.java-version }} - name: Build - run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -388,7 +389,7 @@ jobs: java-version: 11 - name: Build shell: bash - run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/maven' ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -465,7 +466,7 @@ jobs: working-directory: integration-tests/gradle - name: Build shell: bash - run: mvn $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }} - name: Upload Surefire reports (if build failed) uses: actions/upload-artifact@v2 if: failure() @@ -510,7 +511,7 @@ jobs: with: java-version: ${{ matrix.java.java-version }} - name: Build - run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -560,7 +561,7 @@ jobs: java-version: 11 - name: Build shell: bash - run: mvn $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl 'integration-tests/devtools' ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash @@ -622,7 +623,7 @@ jobs: run: mvn -B --settings ../tcks/.github/mvn-settings.xml install working-directory: ./resteasy-reactive-testsuite - name: Verify with Maven - run: mvn -B --settings .github/mvn-settings.xml -Dtcks -pl tcks -amd install ${{ needs.build-jdk11.outputs.gib_args }} + run: mvn $COMMON_MAVEN_ARGS -Dtcks -pl tcks -amd install ${{ needs.build-jdk11.outputs.gib_args }} working-directory: ./tcks - name: Prepare failure archive (if maven failed) if: failure() @@ -703,12 +704,12 @@ jobs: run: | for i in $TEST_MODULES do modules+="integration-tests/$i,"; done - mvn -pl "${modules}" $NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }} + mvn $COMMON_MAVEN_ARGS -pl "${modules}" $NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }} # add the 'simple with spaces' project to the run of 'Misc1' by executing it explicitly # done because there is no good way to pass strings with empty values to the previous command # so this hack is as good as any if [ "$CATEGORY" == "Misc1" ]; then - mvn -Dnative -Dquarkus.native.container-build=true -B --settings .github/mvn-settings.xml -pl 'integration-tests/simple with space/' verify ${{ needs.build-jdk11.outputs.gib_args }} + mvn $COMMON_MAVEN_ARGS -Dnative -Dquarkus.native.container-build=true -pl 'integration-tests/simple with space/' verify ${{ needs.build-jdk11.outputs.gib_args }} fi - name: Prepare failure archive (if maven failed) if: failure() @@ -793,7 +794,7 @@ jobs: run: | for i in $TEST_MODULES do modules+="integration-tests/$i,"; done - mvn -pl "${modules}" $WINDOWS_NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }} + mvn $COMMON_MAVEN_ARGS -pl "${modules}" $WINDOWS_NATIVE_TEST_MAVEN_OPTS ${{ needs.build-jdk11.outputs.gib_args }} - name: Prepare failure archive (if maven failed) if: failure() shell: bash