summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv/compass-ci-jobs.yml
diff options
context:
space:
mode:
authorJun Li <lijun_1203@126.com>2017-07-24 01:09:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-07-24 01:09:19 +0000
commit5546db4ff1d6242250fa2b878e841c16c3be6637 (patch)
tree4c6ffc96ef69afcd013a9fbd9ccba12595524422 /jjb/compass4nfv/compass-ci-jobs.yml
parent248019e7f40011002c28830dad61bba203d90eae (diff)
parent8b2240628d15cb62592c47c9d590f718910e18db (diff)
Merge "[Compass]master daily CI don't download iso from artifacts"
Diffstat (limited to 'jjb/compass4nfv/compass-ci-jobs.yml')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml26
1 files changed, 22 insertions, 4 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 467e168bc..477f8f53c 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -290,10 +290,28 @@
builders:
- description-setter:
description: "POD: $NODE_NAME"
- - shell:
- !include-raw-escape: ./compass-download-artifact.sh
- - shell:
- !include-raw-escape: ./compass-deploy.sh
+ - conditional-step:
+ condition-kind: regex-match
+ regex: master
+ label: '{stream}'
+ steps:
+ - shell:
+ !include-raw-escape: ./compass-build.sh
+ - shell:
+ !include-raw-escape: ./compass-deploy.sh
+ builders:
+ - description-setter:
+ description: "POD: $NODE_NAME"
+ - conditional-step:
+ condition-kind: regex-match
+ regex: danube
+ label: '{stream}'
+ steps:
+ - shell:
+ !include-raw-escape: ./compass-download-artifact.sh
+ - shell:
+ !include-raw-escape: ./compass-deploy.sh
+
########################
# parameter macros