Merge "eiffel: Fix image name var and set harbor credentials"

[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 dff9cf13130bfbdf08ba0efa2cfce7c0b914820f..b288735685de091df18c28c92c059880b3221f1e 100644 (file)
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -1,33 +1,27 @@
 - job-template:
     name: 'onap-{project-name}-{stream}-verify-java'
+    disabled_job_var: false
+    node: onap-ubuntu1804
 
-    node: onap-ubuntu1604
-
-    node_labels: onap-ubuntu1604
-
-    disabled: false
-
+    disabled: '{obj:disabled_job_var}'
     concurrent: true
-
+    mvn_settings_xml_version:
+    mvn_params:
     properties:
       - logrotate
 
     parameters:
-      - string:
-          name: NODE_LABELS
-          default: '{node_labels}'
-          description: node to do build on
       - project-parameters:
           project: 'onap/{project}'
           branch: '{branch}'
       - 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
-          default: 3.3.9
+          default: 3.5.4
           description: Maven version
       - string:
           name: MVN_URL
@@ -37,8 +31,14 @@
           name: MVN
           default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
           description: Path to mvn executable
-
-
+      - string:
+          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.
+      - string:
+          name: MVN_PARAMS
+          default: '{mvn_params}'
+          description: Maven build parameters
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
@@ -59,4 +59,4 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/verify-jobs.sh
+          !include-raw-escape: ./verify-jobs.sh