summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/compass4nfv/compass4nfv.yml20
1 files changed, 9 insertions, 11 deletions
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