X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=6c874e75cc2cb3bd75f3ac3aab7cbd6d7402a872;hb=101073bc4e31995fdb879c6ff08715160ffaa1cb;hp=7a3f2cecb34aebac71f4685d5cf266b4a3168428;hpb=11b5c630d5511f36c08bc793c7eed1885d873674;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 7a3f2cec..6c874e75 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -5,6 +5,10 @@
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
+    mvn_settings_xml_version:
+    mvn_params:
+    mvn_version: 3.5.4
+    subdirectory:
     properties:
       - logrotate
 
@@ -19,7 +23,7 @@
           description: Java home
       - string:
           name: MVN_VERSION
-          default: 3.5.4
+          default: '{mvn_version}'
           description: Maven version
       - string:
           name: MVN_URL
@@ -29,7 +33,18 @@
           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
+      - 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
@@ -51,3 +66,50 @@
     builders:
       - shell:
           !include-raw-escape: ./verify-jobs.sh
+
+# csits for diferent projects are different so need to have special handling
+- job-template:
+    name: 'onap-policy-docker-{stream}-csit-java'
+    disabled_job_var: false
+    node: onap-ubuntu1804
+
+    disabled: '{obj:disabled_job_var}'
+    concurrent: true
+    properties:
+      - logrotate
+
+    parameters:
+      - project-parameters:
+          project: 'onap/{project}'
+          branch: '{branch}'
+      - nordix-gerrit-parameters
+      - string:
+          name: JAVA_HOME
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
+          description: Java home
+      - string:
+          name: CSIT_TEST_NAMES
+          default: '{csit_test_names}'
+          description: The name of the csits test to run
+    scm:
+      - git-scm-gerrit:
+          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
+          branch: 'master'
+          refspec: $GERRIT_REFSPEC
+          wipe_workspace: true
+          clean_before: false
+
+    triggers:
+      - nordix-gerrit-trigger-patchset-created:
+          project: 'onap/{project}'
+          branch: '{branch}'
+          files: '**'
+
+    wrappers:
+      - build-timeout:
+          timeout: 45
+
+    builders:
+      - 'wait-pkg-mgr-macro'
+      - shell:
+          !include-raw-escape: ./policy-docker-csit-jobs.sh