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

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 595c663f7..1d50911bc 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,9 +14,9 @@
     project: 'storperf'
 
 - job-template:
-    name: 'storperf-verify'
+    name: 'storperf-verify-{stream}'
 
-    node: master
+    node: intel-jp-build-1
 
     project-type: freestyle
 
@@ -31,6 +31,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:
@@ -62,17 +66,18 @@
                     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
+    node: intel-jp-build-1
 
     project-type: freestyle
 
@@ -87,6 +92,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:
@@ -112,8 +121,12 @@
                       branch-pattern: '**/master'
 
     builders:
-        - shell:
-            echo "Hello World"
+        - shell: |
+            $WORKSPACE/ci/merge.sh
+
+    publishers:
+        - junit:
+            results: nosetests.xml
 
 
 - job-template:
@@ -124,7 +137,7 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: master
+    node: intel-jp-build-1
 
     disabled: true
 
@@ -154,5 +167,6 @@
         - timed: 'H H * * *'
 
     builders:
-        - shell:
-             echo "Hello World"
+        - shell: |
+            $WORKSPACE/ci/daily.sh
+