summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-01-18 15:44:18 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-18 15:44:18 +0000
commit515abcbb935f90ba2cd0aff853625c8ca629a3b1 (patch)
tree288cc7e42c268f87dd32845ec2a5c0c1ce7c6615
parent3065cd4654c81c841e3793a99465ec28552662c6 (diff)
parenta7f4c34633e1ede041d4fda3110a60c937cfb7c5 (diff)
Merge "apex, functest: Passes DEPLOY_SCENARIO to functest"
-rw-r--r--jjb/apex/apex.yml64
1 files changed, 40 insertions, 24 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index afa46977c..a1b922c5d 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -2,7 +2,7 @@
name: apex
jobs:
- 'apex-verify-{stream}'
- - 'apex-merge-{stream}'
+ - 'apex-runner-{platform}-{scenario}-{stream}'
- 'apex-build-{stream}'
- 'apex-deploy-virtual-{scenario}-{stream}'
- 'apex-deploy-baremetal-{scenario}-{stream}'
@@ -28,6 +28,10 @@
- 'os-onos-nofeature-ha'
- 'os-opencontrail-nofeature-ha'
+ platform:
+ - 'baremetal'
+ - 'virtual'
+
- job-template:
name: 'apex-verify-{stream}'
@@ -89,6 +93,7 @@
- "apex-daily.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
builders:
- 'apex-build'
@@ -107,15 +112,13 @@
- 'apex-workspace-cleanup'
- job-template:
- name: 'apex-merge-{stream}'
+ name: 'apex-runner-{platform}-{scenario}-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
+ # runner jobs for deploying manually
node: opnfv-jump-1
- disabled: true
+ disabled: false
parameters:
- apex-parameter:
@@ -135,26 +138,34 @@
refspec: ''
choosing-strategy: 'default'
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'apex'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**'
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - "apex-daily.*"
+ - "apex-verify.*"
builders:
- - 'apex-build'
- - 'apex-deploy-virtual'
- - 'apex-workspace-cleanup'
+ - trigger-builds:
+ - project: 'apex-deploy-{platform}-{scenario}-{stream}'
+ git-revision: false
+ block: true
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO='{scenario}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'apex-build-{stream}'
@@ -312,6 +323,7 @@
- "apex-verify.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
triggers:
- 'apex-{stream}'
@@ -330,6 +342,8 @@
block: true
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
@@ -350,6 +364,8 @@
block: true
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-onos-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'