summaryrefslogtreecommitdiffstats
path: root/jjb/apex/apex.yml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex/apex.yml')
-rw-r--r--jjb/apex/apex.yml64
1 files changed, 39 insertions, 25 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 5f8d067d0..35e8e3da5 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -25,7 +25,7 @@
scenario:
- 'os-odl_l2-nofeature-ha'
- - 'os-odl_l2-sfc-ha'
+ - 'os-odl_l2-sfc-noha'
- 'os-odl_l3-nofeature-ha'
- 'os-onos-nofeature-ha'
- 'os-opencontrail-nofeature-ha'
@@ -63,7 +63,7 @@
- patchset-created-event:
exclude-drafts: 'false'
exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
+ exclude-no-code-change: 'true'
- draft-published-event
- comment-added-contains-event:
comment-contains-value: 'recheck'
@@ -115,6 +115,12 @@
BUILD_DIRECTORY=apex-verify-{stream}/build_output
git-revision: false
block: true
+ - trigger-builds:
+ - project: 'apex-deploy-virtual-os-odl_l2-sfc-noha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
+ git-revision: false
+ block: true
- 'apex-workspace-cleanup'
- job-template:
@@ -158,6 +164,8 @@
block: true
- trigger-builds:
- project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
block: true
block-thresholds:
build-step-failure-threshold: 'never'
@@ -357,6 +365,8 @@
unstable-threshold: 'FAILURE'
- trigger-builds:
- project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
@@ -379,33 +389,37 @@
unstable-threshold: 'FAILURE'
- trigger-builds:
- project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-onos-nofeature-ha
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+ predefined-parameters:
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
+ git-revision: true
+ block: true
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+ 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}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
-# - trigger-builds:
-# - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
-# predefined-parameters:
-# BUILD_DIRECTORY=apex-build-master/build_output
-# git-revision: true
-# block: true
-# - trigger-builds:
-# - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
-# predefined-parameters:
-# DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
-# 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'
########################
# parameter macros
@@ -598,7 +612,7 @@
fi
RPM_LIST=$RPM_INSTALL_PATH
- for pkg in common undercloud; do
+ for pkg in common undercloud opendaylight-sfc; do
RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
done