Cleanup jjb files

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

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 6769f68..83bab98 100644 (file)
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -1,30 +1,31 @@
 - project:
     name: ovsnfv
+
+    project: '{name}'
+
     jobs:
         - 'ovsnfv-verify-{stream}'
         - 'ovsnfv-merge-{stream}'
         - 'ovsnfv-daily-{stream}'
 
+# only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
             branch: 'master'
-
-    project: 'ovsnfv'
+            gs-pathname: ''
+#        - stable-brahmaputra:
+#            branch: 'stable/brahmaputra'
+#            gs-pathname: '/brahmaputra'
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
 
-    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."
+        - 'intel-us-build-2-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -64,17 +65,12 @@
 - job-template:
     name: 'ovsnfv-merge-{stream}'
 
-    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."
+        - 'intel-us-build-2-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -108,17 +104,10 @@
 - job-template:
     name: 'ovsnfv-daily-{stream}'
 
-    node: opnfv-build
-
-    disabled: true
-
     parameters:
         - project-parameter:
             project: '{project}'
-        - 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."
+        - 'intel-us-build-2-defaults'
 
     scm:
         - git-scm: