X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=6767a978bafd5b24f2b586a8560840b052c6138f;hb=4d5ab9a32200546accd11be254760000902e3fd9;hp=68c0fdf34f11eaa800e0952c8bee29942659feb6;hpb=57ef7c2730929a2dc49825a3fef35a2d789a854b;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 68c0fdf3..6767a978 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -68,8 +68,9 @@
       - shell:
           !include-raw-escape: ./verify-jobs.sh
 
+# A job to perform CSIT on policy components
 - job-template:
-    name: 'onap-{project-name}-{stream}-performance-test-java'
+    name: 'onap-{project-name}-{stream}-policy-csit-verify-java'
     disabled_job_var: false
     node: onap-ubuntu1804
 
@@ -111,18 +112,110 @@
           name: MVN_PARAMS
           default: '{mvn_params}'
           description: Maven build parameters
+      - string:
+          name: CSIT_NAME
+          default: '{csit-name}'
+          description: The name of the csit-test to run
       - 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
+          branch: '{branch}'
+          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:
+      - shell:
+          !include-raw-escape: ./verify-jobs.sh
+      - shell:
+          !include-raw-escape: ./verify-policy-csit.sh
+
+- job-template:
+    name: 'onap-{project-name}-performance-tests-plots'
+    disabled_job_var: false
+
+    triggers:
+      - timed: '{timer}'
+
+    builders:
+      - shell:
+          !include-raw-escape: ./cps/prepare-performance-tests-data.sh
+
+    publishers:
+      - html-publisher:
+          name: "Performance Review"
+          dir: "."
+          files: "index.html,createOperation.html,readOperation.html,updateOperation.html,deleteOperation.html"
+
+- job-template:
+    name: 'onap-{project-name}-{stream}-performance-test-java'
+    disabled_job_var: false
+    node: onap-ubuntu1804
+
+    disabled: '{obj:disabled_job_var}'
+    concurrent: true
+    mvn_settings_xml_version:
+    mvn_params:
+    mvn_version: 3.5.4
+    subdirectory:
+    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: MVN_VERSION
+          default: '{mvn_version}'
+          description: Maven version
+      - string:
+          name: MVN_URL
+          default: https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/$MVN_VERSION/apache-maven-${{MVN_VERSION}}-bin.zip
+          description: URL to download Maven
+      - string:
+          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:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
           wipe_workspace: true
           clean_before: false
-          choosing-strategy: 'default'
 
     triggers:
       - timed: '{timer}'