From 9433f387c0bd9a7c4bd66dbd753bfddcdb928e40 Mon Sep 17 00:00:00 2001
From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com>
Date: Sat, 31 Oct 2020 18:13:55 +0100
Subject: [PATCH] TSK-1282: optimized thread count for provided cores during
 build (n=2)

and unified mvn usage in pipeline + scripts
---
 .travis.yml          | 10 +++++-----
 ci/change_version.sh |  2 +-
 ci/compile.sh        | 16 ++++++++--------
 ci/test.sh           | 22 +++++++++++-----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51896d2c6..12c449f2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,13 +100,13 @@ jobs:
       install: ci/change_version.sh -m .
         && ( cd web && npm install )
         && ( 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 prepare-package -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 -P history.plugin -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot
+        && mvn -q install -B -T 2C -pl :taskana-rest-spring-example-boot,:taskana-cdi -am -DskipTests -Dcheckstyle.skip -Dasciidoctor.skip
+        && mvn -q prepare-package -B -T 2C -pl :taskana-rest-spring
+        && mvn -q install -B -T 2C -f history -DskipTests -Dmaven.javadoc.skip -Dcheckstyle.skip
+        && 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
       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 \
         -pl :taskana-parent,\
         :taskana-common-parent,:taskana-common,:taskana-common-data,:taskana-common-test,\
diff --git a/ci/change_version.sh b/ci/change_version.sh
index fe802e250..1fb07c7e7 100755
--- a/ci/change_version.sh
+++ b/ci/change_version.sh
@@ -21,7 +21,7 @@ set -e #fail fast
 #H       if this is a tagged build then TRAVIS_TAG contains the version number.
 #H       pattern: v[DIGIT].[DIGIT].[DIGIT]
 # Arguments:
-#   $1: exitcode
+#   $1: exit code
 function helpAndExit() {
   cat "$0" | grep "^#H" | cut -c4-
   exit "$1"
diff --git a/ci/compile.sh b/ci/compile.sh
index ebc2ddb5c..c1b09353d 100755
--- a/ci/compile.sh
+++ b/ci/compile.sh
@@ -34,23 +34,23 @@ function main() {
     ;;
   COMMON)
     set -x
-    mvn -q install -B -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N
-    mvn -q test-compile -B -f $REL/../common
+    mvn -q install -B -T 2C -f $REL/.. -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip -N
+    mvn -q test-compile -B -T 2C -f $REL/../common
     ;;
   LIB)
     set -x
-    mvn -q install -B -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
-    mvn -q test-compile -B -f $REL/../lib
+    mvn -q install -B -T 2C -f $REL/.. -pl :taskana-core -am -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
+    mvn -q test-compile -B -T 2C -f $REL/../lib
     ;;
   REST)
     set -x
-    mvn -q install -B -f $REL/.. -pl :taskana-simplehistory-rest-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
-    mvn -q test-compile -B -f $REL/../rest
+    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 -T 2C -f $REL/../rest
     ;;
   HISTORY)
     set -x
-    mvn -q install -B -f $REL/.. -pl :taskana-rest-spring -am -Dasciidoctor.skip -DskipTests -Dcheckstyle.skip -Dmaven.javadoc.skip
-    mvn -q test-compile -B -f $REL/../history
+    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 -T 2C -f $REL/../history
     ;;
   esac
 }
diff --git a/ci/test.sh b/ci/test.sh
index 63e36114b..75de39a67 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -34,50 +34,50 @@ function main() {
   H2)
     set -x
     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
-    (cd $REL/.. && mvn -q install -B -T 4C -am -Pcoverage -Dcheckstyle.skip)
+    # 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 2C -Pcoverage -Dcheckstyle.skip)
     eval "$REL/verify_docs_jar.sh"
     # disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371
     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
-      mvn sonar:sonar -f $REL/.. -Pcoverage -Dsonar.projectKey="$2"
+      mvn -q sonar:sonar -B -T 2C -f $REL/.. -Pcoverage -Dsonar.projectKey="$2"
     fi
     ;;
   DB2_11_1)
     set -x
     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)
     set -x
     eval "$REL/prepare_db.sh '$1'"
     ### 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 ###
-    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)
     set -x
     eval "$REL/prepare_db.sh 'POSTGRES_10'"
     # 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)
     set -x
     ### 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 ###
-    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)
     set -x
     ### INSTALL ###
 
     (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 &
 
     ### TEST ###