Revert "TSK-369: disabled sonartype for pull requests because of incompatibility"

This reverts commit bec6c2949c.
This commit is contained in:
Mustapha Zorgati 2020-01-21 16:34:57 +01:00 committed by Holger Hagen
parent 79605ebd74
commit 063ac889b5
2 changed files with 24 additions and 27 deletions

View File

@ -43,8 +43,8 @@ env:
- DB=POSTGRES_10_4 - DB=POSTGRES_10_4
install: skip install: skip
script: ci/test.sh "$DB" "$([ "false" = "$TRAVIS_PULL_REQUEST" ] && echo "$SONAR_PROJECT_KEY")" script: ci/test.sh $DB
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
jobs: jobs:
include: include:
@ -53,8 +53,8 @@ jobs:
node_js: $NODE_VERSION node_js: $NODE_VERSION
install: skip install: skip
env: DB=WEB env: DB=WEB
script: ci/test.sh "$DB" script: ci/test.sh $DB
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
# We are using the environment variable 'MODULE' to force travis into using a different cache for each build. # We are using the environment variable 'MODULE' to force travis into using a different cache for each build.
# See https://docs.travis-ci.com/user/caching/#caches-and-build-matrices for detailed information on # See https://docs.travis-ci.com/user/caching/#caches-and-build-matrices for detailed information on
@ -65,38 +65,38 @@ jobs:
node_js: $NODE_VERSION node_js: $NODE_VERSION
install: skip install: skip
env: MODULE=WEB env: MODULE=WEB
script: ci/compile.sh "$MODULE" script: ci/compile.sh $MODULE
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
- stage: Compile - stage: Compile
name: taskana-lib name: taskana-lib
install: skip install: skip
env: MODULE=LIB env: MODULE=LIB
script: ci/compile.sh "$MODULE" script: ci/compile.sh $MODULE
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
- stage: Compile - stage: Compile
name: taskana-rest name: taskana-rest
install: skip install: skip
env: MODULE=REST env: MODULE=REST
script: ci/compile.sh "$MODULE" script: ci/compile.sh $MODULE
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
- stage: Compile - stage: Compile
name: taskana-simplehistory name: taskana-simplehistory
install: skip install: skip
env: MODULE=HISTORY env: MODULE=HISTORY
script: ci/compile.sh "$MODULE" script: ci/compile.sh $MODULE
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
- stage: Release / Deploy - stage: Release / Deploy
name: release / deploy / commit name: release / deploy / commit
before_install: | before_install: |
openssl aes-256-cbc -K "$encrypted_21a5d40e43a3_key" -iv "$encrypted_21a5d40e43a3_iv" \ openssl aes-256-cbc -K "$encrypted_21a5d40e43a3_key" -iv "$encrypted_21a5d40e43a3_iv" \
-in "ci/codesigning.asc.enc" -out "ci/codesigning.asc" -d && gpg --import "ci/codesigning.asc" \ -in "ci/codesigning.asc.enc" -out "ci/codesigning.asc" -d && gpg --import "ci/codesigning.asc" \
&& nvm install "$NODE_VERSION" && nvm install $NODE_VERSION
install: ci/change_version.sh -m . install: ci/change_version.sh -m .
&& ( cd web && npm install ) && ( cd web && npm install --silent )
&& ( cd web && npm run build:prod-silent ) && ( cd web && npm run build:prod-silent )
&& mvn -q install -T 4C -am -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot,:taskana-cdi && mvn -q install -T 4C -am -DskipTests -Dcheckstyle.skip -pl :taskana-rest-spring-example-boot,:taskana-cdi
&& mvn -q prepare-package -pl :taskana-rest-spring && mvn -q prepare-package -pl :taskana-rest-spring
@ -108,7 +108,7 @@ jobs:
--settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip -pl !:taskana-spring-example,!:taskana-cdi-example,\ --settings ci/mvnsettings.xml -DskipTests -Dcheckstyle.skip -pl !:taskana-spring-example,!:taskana-cdi-example,\
!:taskana-rest-spring-example-boot,!:taskana-rest-spring-example-wildfly,\ !:taskana-rest-spring-example-boot,!:taskana-rest-spring-example-wildfly,\
!:taskana-simplehistory-spring-test,!:taskana-simplehistory-rest-spring-example !:taskana-simplehistory-spring-test,!:taskana-simplehistory-rest-spring-example
before_cache: rm -rf "$HOME/.m2/repository/pro/taskana" before_cache: rm -rf $HOME/.m2/repository/pro/taskana
after_success: ci/change_version.sh -i -m . && ci/commitPoms.sh after_success: ci/change_version.sh -i -m . && ci/commitPoms.sh
deploy: deploy:
provider: cloudfoundry provider: cloudfoundry

View File

@ -6,7 +6,7 @@ set -e # fail fast
#H #H
#H prints this help and exits #H prints this help and exits
#H #H
#H test.sh <database|module> [sonar project key] #H test.sh <database|module>
#H #H
#H tests the taskana application. See documentation for further testing details. #H tests the taskana application. See documentation for further testing details.
#H #H
@ -17,9 +17,8 @@ set -e # fail fast
#H - POSTGRES_10_4 #H - POSTGRES_10_4
#H module: #H module:
#H - HISTORY #H - HISTORY
#H sonar project key: #H Optional:
#H the key of the sonarqube project where the coverage will be sent to. #H SONAR_PROJECT_KEY - configured in travis env
#H If empty nothing will be sent
# Arguments: # Arguments:
# $1: exit code # $1: exit code
function helpAndExit() { function helpAndExit() {
@ -35,14 +34,12 @@ function main() {
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 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 -Dmaven.javadoc.skip -Dcheckstyle.skip) #-Pcoverage to activate jacoco and test coverage reports
# send test coverage and build information to sonarcloud
# disabling sonarqube for PRs because it's not supported yet. See https://jira.sonarsource.com/browse/MMF-1371 (cd $REL/.. \
if [ -n "$2" ]; then && mvn -q install -B -T 4C -am -Pcoverage -Dmaven.javadoc.skip -Dcheckstyle.skip \
#-Pcoverage to activate jacoco and test coverage reports && mvn sonar:sonar -Pcoverage -Dsonar.projectKey="$SONAR_PROJECT_KEY"
# send test coverage and build information to sonarcloud )
mvn sonar:sonar -f $REL/.. -Pcoverage -Dsonar.projectKey="$2"
fi
;; ;;
DB2_10_5 | DB2_11_1) DB2_10_5 | DB2_11_1)
set -x set -x