TSK-1282: optimized thread count for provided cores during build (n=2)

and unified mvn usage in pipeline + scripts
This commit is contained in:
Mustapha Zorgati 2020-10-31 18:13:55 +01:00
parent 28b3ce6f8a
commit 9433f387c0
4 changed files with 25 additions and 25 deletions

View File

@ -100,13 +100,13 @@ jobs:
install: ci/change_version.sh -m . install: ci/change_version.sh -m .
&& ( cd web && npm install ) && ( cd web && npm install )
&& ( cd web && npm run build:prod-silent ) && ( cd web && npm run build:prod-silent )
&& mvn -q install -T 4C -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot,:taskana-cdi && mvn -q install -B -T 2C -pl :taskana-rest-spring-example-boot,:taskana-cdi -am -DskipTests -Dcheckstyle.skip -Dasciidoctor.skip
&& mvn -q prepare-package -pl :taskana-rest-spring && mvn -q prepare-package -B -T 2C -pl :taskana-rest-spring
&& mvn -q install -f history -T 4C -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-simplehistory-rest-spring && mvn -q install -B -T 2C -f history -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
&& mvn -q install -P history.plugin -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot && mvn -q install -B -T 2C -pl :taskana-rest-spring-example-boot -P history.plugin -DskipTests -Dcheckstyle.skip
before_script: ci/verify_docs_jar.sh before_script: ci/verify_docs_jar.sh
script: | script: |
mvn deploy -T 4C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \ mvn deploy -B -T 2C -P `[[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]] && echo "release" || echo "snapshot"` \
--settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip \ --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip \
-pl :taskana-parent,\ -pl :taskana-parent,\
:taskana-common-parent,:taskana-common,:taskana-common-data,:taskana-common-test,\ :taskana-common-parent,:taskana-common,:taskana-common-data,:taskana-common-test,\

View File

@ -34,23 +34,23 @@ function main() {
;; ;;
COMMON) COMMON)
set -x set -x
mvn -q install -B -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N mvn -q install -B -T 2C -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N
mvn -q test-compile -B -f $REL/../common mvn -q test-compile -B -T 2C -f $REL/../common
;; ;;
LIB) LIB)
set -x set -x
mvn -q install -B -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip mvn -q install -B -T 2C -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
mvn -q test-compile -B -f $REL/../lib mvn -q test-compile -B -T 2C -f $REL/../lib
;; ;;
REST) REST)
set -x set -x
mvn -q install -B -f $REL/.. -pl :taskana-simplehistory-rest-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip mvn -q install -B -T 2C -f $REL/.. -pl :taskana-simplehistory-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip
mvn -q test-compile -B -f $REL/../rest mvn -q test-compile -B -T 2C -f $REL/../rest
;; ;;
HISTORY) HISTORY)
set -x set -x
mvn -q install -B -f $REL/.. -pl :taskana-rest-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -Dasciidoctor.skip
mvn -q test-compile -B -f $REL/../history mvn -q test-compile -B -T 2C -f $REL/../history
;; ;;
esac esac
} }

View File

@ -34,50 +34,50 @@ function main() {
H2) H2)
set -x set -x
eval "$REL/prepare_db.sh '$1'" eval "$REL/prepare_db.sh '$1'"
# We can not use the fance '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049 # We can not use the fancy '-f' maven option due to a bug in arquillian. See https://issues.jboss.org/browse/THORN-2049
(cd $REL/.. && mvn -q install -B -T 4C -am -Pcoverage -Dcheckstyle.skip) (cd $REL/.. && mvn -q install -B -T 2C -Pcoverage -Dcheckstyle.skip)
eval "$REL/verify_docs_jar.sh" eval "$REL/verify_docs_jar.sh"
# disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371 # disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371
if [ -n "$2" ]; then if [ -n "$2" ]; then
# -Pcoverage to activate jacoco and test coverage reports # -Pcoverage to activate jacoco and test coverage reports
# send test coverage and build information to sonarcloud # send test coverage and build information to sonarcloud
mvn sonar:sonar -f $REL/.. -Pcoverage -Dsonar.projectKey="$2" mvn -q sonar:sonar -B -T 2C -f $REL/.. -Pcoverage -Dsonar.projectKey="$2"
fi fi
;; ;;
DB2_11_1) DB2_11_1)
set -x set -x
eval "$REL/prepare_db.sh '$1'" eval "$REL/prepare_db.sh '$1'"
mvn -q verify -B -f $REL/.. -am -T 4C -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-core mvn -q verify -B -T 2C -f $REL/.. -pl :taskana-core -am -Dmaven.javadoc.skip -Dcheckstyle.skip
;; ;;
POSTGRES_10) POSTGRES_10)
set -x set -x
eval "$REL/prepare_db.sh '$1'" eval "$REL/prepare_db.sh '$1'"
### INSTALL ### ### INSTALL ###
mvn -q install -B -f $REL/.. -P postgres -am -T 4C -pl :taskana-rest-spring-example-common -Dasciidoctor.skip -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-common -am -P postgres -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip
### TEST ### ### TEST ###
mvn -q verify -B -f $REL/.. -Dmaven.javadoc.skip -Dcheckstyle.skip -pl :taskana-core mvn -q verify -B -T 2C -f $REL/.. -pl :taskana-core -Dmaven.javadoc.skip -Dcheckstyle.skip
;; ;;
WILDFLY) WILDFLY)
set -x set -x
eval "$REL/prepare_db.sh 'POSTGRES_10'" eval "$REL/prepare_db.sh 'POSTGRES_10'"
# Same as above (H2) we can not use the fancy '-f' maven option # Same as above (H2) we can not use the fancy '-f' maven option
(cd $REL/../rest/taskana-rest-spring-example-wildfly && mvn -q verify -B -Ddb.type=postgres) (cd $REL/../rest/taskana-rest-spring-example-wildfly && mvn -q verify -B -T 2C -Ddb.type=postgres)
;; ;;
HISTORY) HISTORY)
set -x set -x
### INSTALL ### ### INSTALL ###
mvn -q install -B -f $REL/.. -am -T 4C -pl :taskana-rest-spring -Dasciidoctor.skip -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring -am -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip
### TEST ### ### TEST ###
mvn -q verify -B -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip mvn -q verify -B -T 2C -f $REL/../history -Dmaven.javadoc.skip -Dcheckstyle.skip
;; ;;
WEB) WEB)
set -x set -x
### INSTALL ### ### INSTALL ###
(cd $REL/../web && npm install --silent && npm run build:prod-silent) (cd $REL/../web && npm install --silent && npm run build:prod-silent)
mvn -q install -B -f $REL/.. -am -T 4C -pl :taskana-rest-spring-example-boot -Dasciidoctor.skip -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -P history.plugin mvn -q install -B -T 2C -f $REL/.. -pl :taskana-rest-spring-example-boot -am -P history.plugin -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip -Dasciidoctor.skip
mvn spring-boot:run -P history.plugin -f $REL/../rest/taskana-rest-spring-example-boot > /dev/null & mvn spring-boot:run -P history.plugin -f $REL/../rest/taskana-rest-spring-example-boot > /dev/null &
### TEST ### ### TEST ###