From 1b4dfdf4717d11a99317e4b91d42d00344ab7f9b Mon Sep 17 00:00:00 2001
From: m00133142 <meimei@huawei.com>
Date: Wed, 30 Sep 2015 17:13:03 +0800
Subject: add process of building PPA into daily job - divide build job into
 two jobs(build_ppa&build_iso) - run build-iso job once a day - run build-ppa
 job twice a day

JIRA: COMPASS-80

Change-Id: I7780552915993ebfecc534ac633dc23071d8e2ad
Signed-off-by: m00133142 <meimei@huawei.com>
---
 jjb/compass4nfv/compass4nfv.yml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'jjb')

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 032cd9b37..226b3357d 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -11,7 +11,7 @@
         - 'compass-merge'
         - 'compass-daily-{stream}'
         - 'compass-build-iso'
-        - 'compass-build'
+        - 'compass-build-ppa'
         - 'compass-deploy-virtual-{flavor}'
 
     # stream:    branch with - in place of / (eg. stable-helium)
@@ -250,7 +250,7 @@
 
     publishers:
         - trigger:
-            project: 'compass-build'
+            project: 'compass-build-iso'
             threshold: SUCCESS
         - trigger:
             project: 'compass-deploy-virtual-cluster'
@@ -287,7 +287,7 @@
         - 'builder-compass-workspace-cleanup'
 
 - job-template:
-    name: 'compass-build'
+    name: 'compass-build-ppa'
 
     description: "build ppa(using docker) in huawei lab"
 
@@ -310,16 +310,14 @@
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
-
             refspec: ''
             branch: 'master'
 
+    triggers:
+        - timed: 'H 4-18/2 * * *'
+
     builders:
         - 'builder-compass-make-ppa'
-        - trigger-builds:
-          - project: 'compass-build-iso'
-            git-revision: true
-            block: true
 
 - job-template:
     name: 'compass-deploy-virtual-{flavor}'
@@ -429,13 +427,13 @@
             ./build/make_repo.sh
             # calc MD5 of ppa
             cd $PPA_CACHE
-            for i in `find *.gz *.iso *.img -type f`
+            for i in $(find *.gz *.iso *.img -type f)
             do
-                md5=`md5sum $i | cut -d ' ' -f1`
+                md5=$(md5sum $i | cut -d ' ' -f1)
                 echo $md5 > $i.md5
             done
             # upload PPA
-            for i in `find *.* -type f`
+            for i in $(find *.gz *.iso *.img *.md5 -type f)
             do
                 curl -T $i $PPA_REPO
             done
-- 
cgit 1.2.3-korg