X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-java.yaml;h=a54bdce9d4a59ddcdd6715aa5da27d9459e037c0;hb=e9fb762e97e5cca67248601272619f0585f1e1b4;hp=91c4a28ae109bc5bddc76992eca12ff15af05259;hpb=b9f200e9b5ae92bb1d5d7adfb1728b0e1d1adca8;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-java.yaml b/jjb/onap/global-templates-onap-java.yaml
index 91c4a28a..a54bdce9 100644
--- a/jjb/onap/global-templates-onap-java.yaml
+++ b/jjb/onap/global-templates-onap-java.yaml
@@ -145,33 +145,65 @@
       - shell:
           !include-raw-escape: ./verify-policy-csit.sh
 
+# A job to plot the result of cps performance test
 - job-template:
     name: 'onap-{project-name}-performance-tests-plots'
     disabled_job_var: false
+    node: xerces-cps-hw
+    wipe_workspace: false
+
+    triggers:
+      - timed: '{timer}'
 
     builders:
       - shell:
           !include-raw-escape: ./cps/prepare-performance-tests-data.sh
 
     publishers:
-      - plot:
-          - title: "performance"
-            group: "performance"
-            csvFileName: "results.txt"
-            style: line
-            exclude-zero-yaxis: true
-            num-builds: '30'
-            series:
-              - file:
-                url: 'results.txt'
-                inclusion-flag: 'off'
-                display-table: false
-                format: csv
+      - html-publisher:
+          name: "Performance Review"
+          dir: "."
+          files: "cpsStableTestsPerformanceReview.html,ncmpStableTestsPerformanceReview.html,cpsUnstableTestsPerformanceReview.html,ncmpUnstableTestsPerformanceReview.html"
+
+# A job to trigger performance test which are based on K6 Framework on cps project
+- job-template:
+    name: 'onap-{project-name}-performance-test-k6'
+    disabled_job_var: false
+    node: xerces-cps-hw
+    wipe_workspace: false
+
+    triggers:
+      - timed: '{timer}'
 
+    builders:
+      - shell:
+          !include-raw-escape: ./cps/k6-performance-tests-trigger.sh
+
+# A job to plot the result of k6 cps performance test
+- job-template:
+    name: 'onap-{project-name}-k6-performance-tests-plots'
+    disabled_job_var: false
+    node: xerces-cps-hw
+    wipe_workspace: false
+
+    triggers:
+      - timed: '{timer}'
+
+    builders:
+      - shell:
+          !include-raw-escape: ./cps/prepare-k6-performance-tests-plots.sh
+
+    publishers:
+      - html-publisher:
+          name: "K6 Performance Review"
+          dir: "."
+          files: "k6TestsPerformanceReview.html"
+
+# A job to perform performance test which are based on Spock-Groovy Framework on cps project
 - job-template:
     name: 'onap-{project-name}-{stream}-performance-test-java'
     disabled_job_var: false
-    node: onap-ubuntu1804
+    node: xerces-cps-hw
 
     disabled: '{obj:disabled_job_var}'
     concurrent: true
@@ -215,6 +247,7 @@
           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
@@ -248,10 +281,6 @@
       - shell:
           !include-raw-escape: ./verify-jobs.sh
 
-    publishers:
-      - trigger:
-          project: 'onap-cps-performance-tests-plots'
-
 # csits for diferent projects are different so need to have special handling
 - job-template:
     name: 'onap-policy-docker-{stream}-csit-java'