honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
James Agnew 2019-11-23 19:51:02 +01:00 committed by GitHub
parent 58dbad74aa
commit 51b608188b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
azure-pipelines.yml
View File

@ -13,19 +13,22 @@ pool:
jobs: jobs:
- job: Build - job: Build
timeoutInMinutes: 360 timeoutInMinutes: 360
container: maven:3-jdk-11
steps: steps:
- task: CacheBeta@0 - task: CacheBeta@0
inputs: inputs:
key: maven key: maven
path: $(MAVEN_CACHE_FOLDER) path: $(MAVEN_CACHE_FOLDER)
displayName: Cache Maven local repo
- task: Maven@3 - task: Maven@3
env:
JAVA_HOME_11_X64: /usr/local/openjdk-11
inputs: inputs:
goals: 'clean install' 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 # 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) # 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' 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) - script: bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN)
displayName: 'codecov' displayName: 'codecov'
- task: PublishCodeCoverageResults@1 - task: PublishCodeCoverageResults@1

2
hapi-fhir-base/pom.xml
View File

@ -145,7 +145,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-client/pom.xml
View File

@ -58,7 +58,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-jpaserver-base/pom.xml
View File

@ -698,7 +698,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<runOrder>alphabetical</runOrder> <runOrder>alphabetical</runOrder>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx20484M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
<forkCount>0.6C</forkCount> <forkCount>0.6C</forkCount>
<excludes>*StressTest*</excludes> <excludes>*StressTest*</excludes>
</configuration> </configuration>

2
hapi-fhir-jpaserver-searchparam/pom.xml
View File

@ -160,7 +160,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<runOrder>alphabetical</runOrder> <runOrder>alphabetical</runOrder>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx20484M -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
<forkCount>0.6C</forkCount> <forkCount>0.6C</forkCount>
<excludes>*StressTest*</excludes> <excludes>*StressTest*</excludes>
</configuration> </configuration>

2
hapi-fhir-server/pom.xml
View File

@ -97,7 +97,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-dstu/pom.xml
View File

@ -186,7 +186,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-dstu2.1/pom.xml
View File

@ -270,7 +270,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-dstu2/pom.xml
View File

@ -244,7 +244,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>-Dfile.encoding=UTF-8 -Xmx1024m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-dstu3/pom.xml
View File

@ -71,7 +71,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-hl7org-dstu2/pom.xml
View File

@ -269,7 +269,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-r4/pom.xml
View File

@ -315,7 +315,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-structures-r5/pom.xml
View File

@ -308,7 +308,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-test-utilities/pom.xml
View File

@ -81,7 +81,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

2
hapi-fhir-validation/pom.xml
View File

@ -275,7 +275,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>@{argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

33
pom.xml
View File

@ -582,9 +582,11 @@
<properties> <properties>
<fhir_core_version>4.1.0</fhir_core_version> <fhir_core_version>4.1.7-SNAPSHOT</fhir_core_version>
<ucum_version>1.0.2</ucum_version> <ucum_version>1.0.2</ucum_version>
<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx1024m</surefire_jvm_args>
<!-- configure timestamp in MANIFEST.MF for maven-war-provider --> <!-- configure timestamp in MANIFEST.MF for maven-war-provider -->
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format> <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
@ -1657,9 +1659,9 @@
<configuration> <configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
<runOrder>random</runOrder> <runOrder>random</runOrder>
<argLine>-Dfile.encoding=UTF-8 -Xmx1024m</argLine> <argLine>@{argLine} ${surefire_jvm_args}</argLine>
<forkCount>1.0C</forkCount> <forkCount>1.0C</forkCount>
<trimStackTrace>false</trimStackTrace> <trimStackTrace>false</trimStackTrace>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -2488,6 +2490,31 @@
<modules> <modules>
<module>hapi-fhir-jacoco</module> <module>hapi-fhir-jacoco</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<dumpOnExit>true</dumpOnExit>
</configuration>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>CI</id>
<properties>
<surefire_jvm_args>-Dfile.encoding=UTF-8 -Xmx2048m -XX:TieredStopAtLevel=1 -XX:+UseParallelGC -Xverify:none -Dfile.encoding=UTF-8 -Xss128M -XX:MetaspaceSize=512M -XX:MaxMetaspaceSize=2048M</surefire_jvm_args>
</properties>
</profile> </profile>
<profile> <profile>
<id>NOPARALLEL</id> <id>NOPARALLEL</id>