summaryrefslogtreecommitdiffstats
path: root/jjb/yardstick/yardstick-ci-jobs.yml
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 14:37:40 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-07 14:55:48 +0000
commite8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 (patch)
tree0ae6865789e89d1dc8632b6d7b04f6a4697d0487 /jjb/yardstick/yardstick-ci-jobs.yml
parent324a87b519694309d141bbec8d15726d9cc1adb8 (diff)
Enable fuel nosdn scenario for master and stable/brahmaputra
This patch proposes below changes: - Run CI on opnfv-jump-2 against stable/brahmaputra branch - Run CI on ericsson-pod2 against master branch - Configure functest against both branches on both PODs - Enable yardstick against both branches on both PODs - Comment out additional controllers until nosdn scenario is verified - Rename OPNFV_FEATURE to DEPLOY_SCENARIO Change-Id: Ie3d4f946cd51271378b435f9a92af07aaf614c26 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/yardstick/yardstick-ci-jobs.yml')
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index fb05b3336..f88a399bc 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -23,15 +23,15 @@
# brahmaputra
#--------------------------------
pod:
+ - opnfv-jump-2:
+ installer: fuel
+ <<: *brahmaputra
- intel-pod5:
installer: joid
<<: *brahmaputra
#--------------------------------
# master
#--------------------------------
- - opnfv-jump-2:
- installer: fuel
- <<: *master
- ericsson-pod1:
installer: fuel
<<: *master