From 51b608188b04bde784944991ef02274d209febb6 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Sat, 23 Nov 2019 19:51:02 +0100 Subject: [PATCH] Some CI surefire improvements (#1602) * Some CI surefire improvements * Build tweak * More tweak * Update azure-pipelines.yml for Azure Pipelines * Update azure-pipelines.yml for Azure Pipelines * One more CI attempt * Update azure-pipelines.yml for Azure Pipelines * Tweak command line * Another build test fixc * More build cleanup --- azure-pipelines.yml | 7 +++-- hapi-fhir-base/pom.xml | 2 +- hapi-fhir-client/pom.xml | 2 +- hapi-fhir-jpaserver-base/pom.xml | 2 +- hapi-fhir-jpaserver-searchparam/pom.xml | 2 +- hapi-fhir-server/pom.xml | 2 +- hapi-fhir-structures-dstu/pom.xml | 2 +- hapi-fhir-structures-dstu2.1/pom.xml | 2 +- hapi-fhir-structures-dstu2/pom.xml | 2 +- hapi-fhir-structures-dstu3/pom.xml | 2 +- hapi-fhir-structures-hl7org-dstu2/pom.xml | 2 +- hapi-fhir-structures-r4/pom.xml | 2 +- hapi-fhir-structures-r5/pom.xml | 2 +- hapi-fhir-test-utilities/pom.xml | 2 +- hapi-fhir-validation/pom.xml | 2 +- pom.xml | 33 ++++++++++++++++++++--- 16 files changed, 49 insertions(+), 19 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b275adab5dc..2de8adae5c0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,19 +13,22 @@ pool: jobs: - job: Build timeoutInMinutes: 360 + container: maven:3-jdk-11 steps: - task: CacheBeta@0 inputs: key: maven path: $(MAVEN_CACHE_FOLDER) - displayName: Cache Maven local repo - task: Maven@3 + env: + JAVA_HOME_11_X64: /usr/local/openjdk-11 inputs: goals: 'clean install' # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy - options: '-P ALLMODULES,JACOCO -nsu' + options: '-P ALLMODULES,JACOCO,CI -nsu' # These are JVM options (and don't show up in the build logs) mavenOptions: '-Xmx2048m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto' + jdkVersionOption: 1.11 - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) displayName: 'codecov' - task: PublishCodeCoverageResults@1 diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index ff88ecbf8b7..1193fac9f34 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -145,7 +145,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml index 4b772b2adfa..69e09a3a601 100644 --- a/hapi-fhir-client/pom.xml +++ b/hapi-fhir-client/pom.xml @@ -58,7 +58,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index 9e5c528be0a..62b09103e5b 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -698,7 +698,7 @@ maven-surefire-plugin alphabetical - @{argLine} -Dfile.encoding=UTF-8 -Xmx20484M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC + @{argLine} ${surefire_jvm_args} 0.6C *StressTest* diff --git a/hapi-fhir-jpaserver-searchparam/pom.xml b/hapi-fhir-jpaserver-searchparam/pom.xml index 01cff26d4b9..06f462936c4 100755 --- a/hapi-fhir-jpaserver-searchparam/pom.xml +++ b/hapi-fhir-jpaserver-searchparam/pom.xml @@ -160,7 +160,7 @@ maven-surefire-plugin alphabetical - @{argLine} -Dfile.encoding=UTF-8 -Xmx20484M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC + @{argLine} ${surefire_jvm_args} 0.6C *StressTest* diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml index c8f7b302d89..56d24a8322d 100644 --- a/hapi-fhir-server/pom.xml +++ b/hapi-fhir-server/pom.xml @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-dstu/pom.xml b/hapi-fhir-structures-dstu/pom.xml index c280284e4cf..a98cdca2416 100644 --- a/hapi-fhir-structures-dstu/pom.xml +++ b/hapi-fhir-structures-dstu/pom.xml @@ -186,7 +186,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml index b30ce9c68c8..c12b498af04 100644 --- a/hapi-fhir-structures-dstu2.1/pom.xml +++ b/hapi-fhir-structures-dstu2.1/pom.xml @@ -270,7 +270,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 9d6515955c7..cb64e29ef8d 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -244,7 +244,7 @@ org.apache.maven.plugins maven-surefire-plugin - -Dfile.encoding=UTF-8 -Xmx1024m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml index e5041555f2c..e8955655dd3 100644 --- a/hapi-fhir-structures-dstu3/pom.xml +++ b/hapi-fhir-structures-dstu3/pom.xml @@ -71,7 +71,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml index 7e7a3863829..8fdae251c75 100644 --- a/hapi-fhir-structures-hl7org-dstu2/pom.xml +++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml @@ -269,7 +269,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml index cef4c123170..4fe0dde8998 100644 --- a/hapi-fhir-structures-r4/pom.xml +++ b/hapi-fhir-structures-r4/pom.xml @@ -315,7 +315,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml index 72cc390946f..92dabe9671b 100644 --- a/hapi-fhir-structures-r5/pom.xml +++ b/hapi-fhir-structures-r5/pom.xml @@ -308,7 +308,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index cd1414359ea..d010e06b048 100644 --- a/hapi-fhir-test-utilities/pom.xml +++ b/hapi-fhir-test-utilities/pom.xml @@ -81,7 +81,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml index 3fc2ccd1726..f242ef53002 100644 --- a/hapi-fhir-validation/pom.xml +++ b/hapi-fhir-validation/pom.xml @@ -275,7 +275,7 @@ org.apache.maven.plugins maven-surefire-plugin - @{argLine} -Dfile.encoding=UTF-8 -Xmx712m + @{argLine} ${surefire_jvm_args} diff --git a/pom.xml b/pom.xml index 7b85ee59019..5a9528e2e53 100755 --- a/pom.xml +++ b/pom.xml @@ -582,9 +582,11 @@ - 4.1.0 + 4.1.7-SNAPSHOT 1.0.2 + -Dfile.encoding=UTF-8 -Xmx1024m + yyyy-MM-dd'T'HH:mm:ss'Z' @@ -1657,9 +1659,9 @@ true random - -Dfile.encoding=UTF-8 -Xmx1024m + @{argLine} ${surefire_jvm_args} 1.0C - false + false @@ -2488,6 +2490,31 @@ hapi-fhir-jacoco + + + + org.jacoco + jacoco-maven-plugin + + true + + + + default-prepare-agent + + prepare-agent + + + + + + + + + CI + + -Dfile.encoding=UTF-8 -Xmx2048m -XX:TieredStopAtLevel=1 -XX:+UseParallelGC -Xverify:none -Dfile.encoding=UTF-8 -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M + NOPARALLEL