From d10e5643a43507f5e16257366ce20356134f62c9 Mon Sep 17 00:00:00 2001
From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 31 Mar 2017 16:35:39 +0800
Subject: add daisy unittest verify job

Change-Id: Iab5b7126f72efa942e6e1a25d0a1af67c4c52aa6
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---
 jjb/daisy4nfv/daisy4nfv-verify-jobs.yml | 40 ++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'jjb/daisy4nfv')

diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 6b47ba963..a0ec2ebd7 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,22 @@
 #####################################
 - job-template:
     name: '{alias}-verify-{stream}'
-
     project-type: multijob
-
     disabled: false
-
     concurrent: true
-
     properties:
         - logrotate-default
         - throttle:
             enabled: true
             max-total: 4
             option: 'project'
-
     scm:
         - git-scm
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
-
     triggers:
         - gerrit:
             server-name: 'gerrit.opnfv.org'
@@ -107,6 +99,15 @@
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
+        - multijob:
+            name: unit
+            condition: SUCCESSFUL
+            projects:
+                - name: '{alias}-verify-{name}-{stream}'
+                  current-parameters: true
+                  node-parameters: false
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
         - multijob:
             name: build
             condition: SUCCESSFUL
@@ -124,27 +125,21 @@
 
 - job-template:
     name: '{alias}-verify-{phase}-{stream}'
-
     disabled: '{obj:disabled}'
-
     concurrent: true
-
     properties:
         - logrotate-default
         - throttle:
             enabled: true
             max-total: 6
             option: 'project'
-
     scm:
         - git-scm
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 360
             fail: true
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -152,7 +147,6 @@
         - '{slave-label}-defaults'
         - '{alias}-verify-defaults':
             gs-pathname: '{gs-pathname}'
-
     builders:
         - description-setter:
             description: "Built on $NODE_NAME"
@@ -171,6 +165,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
 #####################################
-- 
cgit 1.2.3-korg