X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Ffuel%2Ffuel-project-jobs.yml;h=8fdf8deaed9eb3a09d9b7906d5f14a783ad384fa;hb=refs%2Fchanges%2F99%2F26199%2F1;hp=cf893832baa08aa9f4c65b98c228b9e7124aa8ba;hpb=2d159fc0fc7c2b0cd4c911e30f83a4713ee0a2dc;p=releng.git

diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index cf893832b..8fdf8deae 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -44,6 +44,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
         - choice:
@@ -56,10 +58,7 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - timed: '0 H/4 * * *'
@@ -79,7 +78,7 @@
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com
 
 - job-template:
     name: 'fuel-merge-build-{stream}'
@@ -99,21 +98,17 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -174,18 +169,14 @@
         - fuel-project-parameter:
             gs-pathname: '{gs-pathname}'
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
+        - ssh-agent-wrapper
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
@@ -218,7 +209,7 @@
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com
 
 - job-template:
     name: 'fuel-deploy-generic-daily-{stream}'
@@ -242,6 +233,8 @@
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - '{installer}-defaults'
         - string:
             name: GIT_BASE
@@ -263,10 +256,7 @@
             gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     wrappers:
         - build-name: