From e8ce776643726d0e8f9ff8d6cc0145358ffd3bf0 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Thu, 7 Jan 2016 14:37:40 +0100 Subject: 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 --- jjb/functest/functest-ci-jobs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jjb/functest') diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index f844b1631..725dd899d 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -23,6 +23,9 @@ # brahmaputra #-------------------------------- pod: + - opnfv-jump-2: + installer: fuel + <<: *brahmaputra - intel-pod5: installer: joid <<: *brahmaputra @@ -38,9 +41,6 @@ - intel-us-deploy-virtual-2: installer: apex <<: *master - - opnfv-jump-2: - installer: fuel - <<: *master - ericsson-pod1: installer: fuel <<: *master -- cgit 1.2.3-korg