Merge "Allow verify in specific subdirectory"

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
index 2242a18da406b89fcc02c910940908922c56a1bc..f5101717fe8c39c12a26c20b916c7f5810971de3 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-deploy-test.yaml
@@ -210,7 +210,6 @@
                 fi
 
     builders:
-      - 'generate-release-metadata-macro'
       - 'generate-k8sdeployment-environment-macro'
       - multijob:
           name: "{environment-type} deployment on {type} instances"
@@ -230,7 +229,6 @@
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: false
-              property-file: $WORKSPACE/release.properties
     publishers:
       - postbuildscript:
           builders:

diff --git a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
index e3810cb5cf06a8b8ea01b91541e20d70c148d7de..3909f642a6fc39e732e749c01ea127f972b69fe9 100644 (file)
--- a/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
+++ b/jjb/cloud-infra/onap-jobs/onap-release-jobs.yaml
@@ -251,7 +251,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 60
+          timeout: 600
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'

diff --git a/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml b/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
index 2bec171143a27fbf359b41a3ed761f58c8dabb2f..5b71dfce0f047ec5d69102df9ecbbd672237e0a5 100644 (file)
--- a/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
+++ b/jjb/onap/uds-sdc-customization/uds-sdc-customization-verify-jobs.yaml
@@ -24,6 +24,7 @@
     name: uds-sdc-customization-verify
     project: uds/sdc-customization
     project-name: uds-sdc-customization
+    mvn_params: "-Djacoco.skip=true -DskipPMD -Dcheckstyle.skip=true"
 
     stream:
       - 'master':

diff --git a/jjb/onap/uds/scripts/maven-build.sh b/jjb/onap/uds/scripts/maven-build.sh
index 506c957990fa88e64383c8258b39ed87005dee1a..761e4292f42118600b15b45003f7082b1e0b9603 100644 (file)
--- a/jjb/onap/uds/scripts/maven-build.sh
+++ b/jjb/onap/uds/scripts/maven-build.sh
@@ -80,5 +80,5 @@ do
   echo "----------------------------------------------------"
   echo "INFO: Maven Build for ${PROJECTS[$i]}"
   echo "----------------------------------------------------"
-  $MVN clean install $MVN_PARAMS -f ${PROJECT_DIRECTORIES[$i]}
+  $MVN -U clean install $MVN_PARAMS -f ${PROJECT_DIRECTORIES[$i]}
 done