merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / storperf / storperf.yml

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index 902fff9..a04a9f4 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -28,7 +28,6 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_BASE
@@ -89,8 +88,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -144,15 +142,13 @@
     # Required Variables:
     #     stream:    branch with - in place of / (eg. stable)
     #     branch:    branch (eg. stable)
-    node: storperf-pod
-
-    disabled: false
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
+        - 'intel-pod9-defaults'
 
     scm:
         - git-scm