X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsnfv%2Fovsnfv.yml;h=62f6de05a3789fe78c30c036a8a326a86a0314da;hb=f72568ab268851606a4242b193c31c1b4ab1ff85;hp=f002dfae0ab81446fa6ffded5b0f0b0dfd238f57;hpb=3f0f49c15802a4e1ebb5f18d629e85368092a664;p=releng.git

diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index f002dfae0..62f6de05a 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -13,18 +13,19 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - brahmaputra:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
-            disabled: true
+            disabled: false
 
 - job-template:
     name: 'ovsnfv-verify-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
         - string:
@@ -33,13 +34,11 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -68,10 +67,11 @@
 - job-template:
     name: 'ovsnfv-merge-{stream}'
 
+    disabled: '{obj:disabled}'
+
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
             branch: '{branch}'
         - 'opnfv-build-centos-defaults'
         - string:
@@ -80,10 +80,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     wrappers:
         - timeout:
@@ -92,6 +89,7 @@
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -114,11 +112,12 @@
 - job-template:
     name: 'ovsnfv-daily-{stream}'
 
-    disabled: '{disabled}'
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - 'opnfv-build-centos-defaults'
         - string:
             name: GS_URL
@@ -126,10 +125,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     wrappers:
         - timeout:
@@ -145,6 +141,7 @@
     publishers:
         - email:
             recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
+        - email-jenkins-admins-on-failure
 
 - builder:
     name: build-rpms