X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy4nfv-verify-jobs.yml;h=6f6ab0fb0ad65f77c5d6567180ee7e2999457266;hb=20b31307c730a6561107dba6299d3a47dd4c3090;hp=ee78ab59f2998215151a6ea77e913568f2639e14;hpb=f69288cbd365dca89ee74b2f8279c35875b28e18;p=releng.git

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index ee78ab59f..6f6ab0fb0 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -1,10 +1,7 @@
 - project:
     name: 'daisy4nfv-verify-jobs'
-
     project: 'daisy'
-
     installer: 'daisy'
-
 ##########################################################
 # use alias to keep the jobs'name existed alread unchanged
 ##########################################################
@@ -26,7 +23,9 @@
 # patch verification phases
 #####################################
     phase:
-        - 'build':
+        - unit:
+            slave-label: 'opnfv-build'
+        - build:
             slave-label: 'opnfv-build-centos'
 #####################################
 # jobs
@@ -39,29 +38,28 @@
 #####################################
 - job-template:
     name: '{alias}-verify-{stream}'
-
     project-type: multijob
-
     disabled: false
-
     concurrent: true
-
     properties:
         - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
             option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - '{alias}-merge-build-.*'
+            block-level: 'NODE'
 
     scm:
-        - git-scm
-
+        - git-scm-gerrit
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
-
     triggers:
         - gerrit:
             server-name: 'gerrit.opnfv.org'
@@ -107,6 +105,20 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
+        - multijob:
+            name: unit
+            condition: SUCCESSFUL
+            projects:
+                - 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
         - multijob:
             name: build
             condition: SUCCESSFUL
@@ -124,11 +136,8 @@
 
 - job-template:
     name: '{alias}-verify-{phase}-{stream}'
-
     disabled: '{obj:disabled}'
-
     concurrent: true
-
     properties:
         - logrotate-default
         - throttle:
@@ -138,22 +147,23 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - '{alias}-verify-deploy-.*'
+                - '{alias}-merge-build-.*'
+                - '{alias}-verify-build-.*'
+                - '{installer}-daily-.*'
             block-level: 'NODE'
 
     scm:
-        - git-scm
-
+        - git-scm-gerrit
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
-
     parameters:
         - project-parameter:
             project: '{project}'
             branch: '{branch}'
+        - '{installer}-defaults'
         - '{slave-label}-defaults'
         - '{alias}-verify-defaults':
             gs-pathname: '{gs-pathname}'
@@ -176,6 +186,16 @@
         - shell:
             !include-raw: ./daisy4nfv-workspace-cleanup.sh
 
+- builder:
+    name: daisy-verify-unit-macro
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o pipefail
+            set -o xtrace
+            tox -e py27
+
 #####################################
 # parameter macros
 #####################################