X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fverify-jobs.sh;h=5cb0b004271ea5a60117ffd6f31c2b15c0f6a926;hb=3c92f18f48b4ab75710ff0b954d47c494438885b;hp=b07f82dced9813087b7f061ee9869e6bbca8c7f4;hpb=fe25077dc847f36795636dd7556e8614cc34b203;p=infra%2Fcicd.git diff --git a/jjb/onap/verify-jobs.sh b/jjb/onap/verify-jobs.sh index b07f82dc..5cb0b004 100755 --- a/jjb/onap/verify-jobs.sh +++ b/jjb/onap/verify-jobs.sh @@ -27,13 +27,31 @@ if [[ -v ${MVN_SETTINGS_XML_VERSION} ]]; then git checkout "${MVN_SETTINGS_XML_VERSION}" fi set -o nounset + +# if MVN_PARAMS set then use them otherwise default to "" +LOCAL_MVN_PARAMS="" +set +o nounset +if [[ -n ${MVN_PARAMS} ]]; then + LOCAL_MVN_PARAMS=${MVN_PARAMS} +fi +set -o nounset + # Copy Onap maven settings.xml to Jenkins home directory if [ ! -d /home/jenkins/.m2 ]; then mkdir -p /home/jenkins/.m2/ fi cp settings.xml /home/jenkins/.m2/settings.xml cd $WORKSPACE + +POMFILE="-f $WORKSPACE/pom.xml" +set +o nounset +if [[ -n ${SUBDIRECTORY} ]]; then + POMFILE="-f $WORKSPACE/$SUBDIRECTORY/pom.xml" + echo "Setting pom.xml to use to $POMFILE" +fi +set -o nounset + echo "----------------------------------------------------" echo "Proceeding with unit test" echo "----------------------------------------------------" -$MVN clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ No newline at end of file +$MVN clean install -U -B $POMFILE -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $LOCAL_MVN_PARAMS