Fix verify job without patchset

use git-scm-gerrit to fetch the patchset
fix the wrong job name

Change-Id: If26dbb08da95f37d65e6b21770ef7f1d7de0c5e1
Signed-off-by: Julien <zhang.jun3g@zte.com.cn>

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index a0ec2eb..6335c33 100644 (file)
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -48,7 +48,7 @@
             max-total: 4
             option: 'project'
     scm:
-        - git-scm
+        - git-scm-gerrit
     wrappers:
         - ssh-agent-wrapper
         - timeout:
@@ -103,8 +103,13 @@
             name: unit
             condition: SUCCESSFUL
             projects:
-                - name: '{alias}-verify-{name}-{stream}'
-                  current-parameters: true
+                - name: '{alias}-verify-unit-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    BRANCH=$BRANCH
+                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: false
                   kill-phase-on: FAILURE
                   abort-all-job: true
@@ -134,7 +139,7 @@
             max-total: 6
             option: 'project'
     scm:
-        - git-scm
+        - git-scm-gerrit
     wrappers:
         - ssh-agent-wrapper
         - timeout: