Merge "Allow verify in specific subdirectory"

diff --git a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
index f21946edfd00d043f755899254732158e39e7c76..55f8613fa2965953f40220b695463f9443cf1b98 100644 (file)
--- a/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
+++ b/jjb/onap/ccsdk-features/ccsdk-features-verify-jobs.yaml
@@ -31,5 +31,6 @@
       - cps_poc:
           branch: '{stream}'
           jdk-version: java-11
+          subdirectory: cps
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index b288735685de091df18c28c92c059880b3221f1e..49254f2202e8aad82618aaf61258bc3b72ecbcda 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -7,6 +7,7 @@
     concurrent: true
     mvn_settings_xml_version:
     mvn_params:
+    subdirectory:
     properties:
       - logrotate
 
@@ -39,6 +40,10 @@
           name: MVN_PARAMS
           default: '{mvn_params}'
           description: Maven build parameters
+      - string:
+          name: SUBDIRECTORY
+          default: '{subdirectory}'
+          description: Subdirectory of the workspace for which the pom.xml will be called. This allows the verify to be called against a specific directory
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh

diff --git a/jjb/onap/verify-jobs.sh b/jjb/onap/verify-jobs.sh
index edd6622cdd9bfe4a9cd851ae4eb5b7c5cde15abf..5cb0b004271ea5a60117ffd6f31c2b15c0f6a926 100755 (executable)
--- a/jjb/onap/verify-jobs.sh
+++ b/jjb/onap/verify-jobs.sh
@@ -42,7 +42,16 @@ if [ ! -d /home/jenkins/.m2 ]; then
 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 -U -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $LOCAL_MVN_PARAMS
+$MVN clean install -U -B $POMFILE -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $LOCAL_MVN_PARAMS