Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixing cleanup job"
[infra/cicd.git]
/
jjb
/
onap
/
global-templates-onap-java.yaml
diff --git
a/jjb/onap/global-templates-onap-java.yaml
b/jjb/onap/global-templates-onap-java.yaml
index c11280a1bdf0bdfe0e4a6b9ada52059fe4281dd3..f2fab414cc403b59ce57b03682d33898d0b042a1 100644
(file)
--- a/
jjb/onap/global-templates-onap-java.yaml
+++ b/
jjb/onap/global-templates-onap-java.yaml
@@
-1,12
+1,11
@@
- job-template:
name: 'onap-{project-name}-{stream}-verify-java'
- job-template:
name: 'onap-{project-name}-{stream}-verify-java'
+ disabled_job_var: false
+ node: onap-ubuntu1804
- node: onap-ubuntu1604
-
- disabled: false
-
+ disabled: '{obj:disabled_job_var}'
concurrent: true
concurrent: true
-
+ mvn_settings_xml_version:
properties:
- logrotate
properties:
- logrotate
@@
-17,11
+16,11
@@
- nordix-gerrit-parameters
- string:
name: JAVA_HOME
- nordix-gerrit-parameters
- string:
name: JAVA_HOME
- default:
/usr/lib/jvm/java-1.8.0-openjdk-amd64
+ default:
'/usr/lib/jvm/{jdk-version}-openjdk-amd64'
description: Java home
- string:
name: MVN_VERSION
description: Java home
- string:
name: MVN_VERSION
- default: 3.
3.9
+ default: 3.
5.4
description: Maven version
- string:
name: MVN_URL
description: Maven version
- string:
name: MVN_URL
@@
-32,9
+31,9
@@
default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
description: Path to mvn executable
- string:
default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
description: Path to mvn executable
- string:
- name:
NODE
- default: '
${node
}'
- description:
node to do build on
+ name:
MVN_SETTINGS_XML_VERSION
+ default: '
{mvn_settings_xml_version
}'
+ description:
Commit ID of ONAP Oparent repository (https://git.onap.org/oparent/) to pull. Used for Maven settings file. Can be left blank to pull the latest version.
scm:
- git-scm-gerrit:
scm:
- git-scm-gerrit:
@@
-56,4
+55,4
@@
builders:
- shell:
builders:
- shell:
- !include-raw-escape: .
./global
/verify-jobs.sh
+ !include-raw-escape: ./verify-jobs.sh