summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-01-25 13:03:42 +0800
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-25 09:40:00 +0000
commitc2016339efc653317861479b8ee919f9956c514f (patch)
treefe04eddcc9f4872d56b316b2b1569290785bbf2a
parenta9cf10333f56f6bcef53867b624d084823c76b5c (diff)
[compass] switch to free-style build
Change-Id: Id7d7dbcdd9618c38f68c28df280fe48a009b1c1c Signed-off-by: meimei <meimei@huawei.com>
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml59
1 files changed, 31 insertions, 28 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 99c40cbbe..a9b5a6ce5 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -49,7 +49,7 @@
auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
jobs:
- - 'compass-{scenario}-{pod}-daily-{stream}'
+# - 'compass-{scenario}-{pod}-daily-{stream}'
- 'compass-deploy-{pod}-daily-{stream}'
########################
@@ -58,8 +58,6 @@
- job-template:
name: 'compass-{scenario}-{pod}-daily-{stream}'
- project-type: multijob
-
node: huawei-build
concurrent: false
@@ -90,37 +88,42 @@
- string:
name: DEPLOY_SCENARIO
default: '{scenario}'
- - 'huawei-build-defaults'
+ - '{pod}-defaults'
- '{installer}-defaults'
triggers:
- '{auto-trigger-name}'
builders:
- - multijob:
- name: deploy
- condition: SUCCESSFUL
- projects:
- - name: 'compass-deploy-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
- kill-phase-on: FAILURE
- - multijob:
- name: functest
- condition: COMPLETED
- projects:
- - name: 'functest-compass-{pod}-daily-{stream}'
- current-parameters: true
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
- kill-phase-on: NEVER
- - multijob:
- name: yardstick
- condition: COMPLETED
- projects:
- - name: 'yardstick-compass-{pod}-daily-{stream}'
- current-parameters: true
- predefined-parameters: 'DEPLOY_SCENARIO={scenario}'
- kill-phase-on: NEVER
+ - trigger-builds:
+ - project: 'compass-deploy-{pod}-daily-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ same-node: true
+ block: true
+ - trigger-builds:
+ - project: 'functest-compass-{pod}-daily-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ same-node: true
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-compass-{pod}-daily-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'compass-deploy-{pod}-daily-{stream}'