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 2242a18..f510171 100644
--- 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 e3810cb..3909f64 100644
--- 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 2bec171..5b71dfc 100644
--- 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 506c957..761e429 100644
--- a/jjb/onap/uds/scripts/maven-build.sh
+++ b/jjb/onap/uds/scripts/maven-build.sh
@@ -80,5 +80,5 @@
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