X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fstorperf%2Fstorperf.yml;h=c58f9efce5dcecd4b32add2950d39fec39f1f5a5;hb=0930be5a3cf6465991ec13ba75252f0764aa5e69;hp=595c663f763191e09102294ec484dd03744e5d76;hpb=f7ac7b481fa3806d00aaafcf94084594eff9aefd;p=releng.git

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 595c663f7..c58f9efce 100644
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -1,8 +1,8 @@
 - project:
     name: storperf
     jobs:
-        - 'storperf-verify'
-        - 'storperf-merge'
+        - 'storperf-verify-{stream}'
+        - 'storperf-merge-{stream}'
         - 'storperf-daily-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
@@ -14,11 +14,9 @@
     project: 'storperf'
 
 - job-template:
-    name: 'storperf-verify'
+    name: 'storperf-verify-{stream}'
 
-    node: master
-
-    project-type: freestyle
+    node: opnfv-build
 
     logrotate:
         daysToKeep: 30
@@ -31,6 +29,10 @@
             project: '{project}'
         - gerrit-parameter:
             branch: 'master'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
 
     scm:
         - gerrit-trigger-scm:
@@ -38,10 +40,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -62,31 +60,27 @@
                     branch-pattern: '**/master'
 
     builders:
-        - shell:
-            echo "Hello World"
+        - shell: |
+            $WORKSPACE/ci/verify.sh
 
 - job-template:
-    name: 'storperf-merge'
+    name: 'storperf-merge-{stream}'
 
     # builder-merge job to run JJB update
     #
     # This job's purpose is to update all the JJB
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    node: opnfv-build
 
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: 'master'
+        - string:
+            name: GIT_BASE
+            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+            description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
 
     scm:
         - gerrit-trigger-scm:
@@ -94,10 +88,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -112,9 +102,27 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell:
-            echo "Hello World"
-
+        - shell: |
+            $WORKSPACE/ci/merge.sh
+
+    publishers:
+        - junit:
+            results: nosetests.xml
+        - cobertura:
+            report-file: "coverage.xml"
+            only-stable: "true"
+            health-auto-update: "true"
+            stability-auto-update: "true"
+            zoom-coverage-chart: "true"
+            targets:
+                - files:
+                    healthy: 10
+                    unhealthy: 20
+                    failing: 30
+                - method:
+                    healthy: 50
+                    unhealthy: 40
+                    failing: 30
 
 - job-template:
     name: 'storperf-daily-{stream}'
@@ -124,18 +132,10 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: master
+    node: opnfv-build
 
     disabled: true
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -146,13 +146,10 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - timed: 'H H * * *'
 
     builders:
-        - shell:
-             echo "Hello World"
+        - shell: |
+            $WORKSPACE/ci/daily.sh
+