diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 11:10:38 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-07 13:16:16 +0100 |
| commit | 62b0d5baa45d18fb8553aeb5cc2424764a4fac4a (patch) | |
| tree | 291d774065921c41c5be8185425dc09b82e507d2 /jjb/functest | |
| parent | 97396b21dd66a622dad5548c364159c973d82303 (diff) | |
Enable joid Arno scenario for master and stable/brahmaputra
This patch proposes below changes:
- Run CI on intel-pod5 against stable/brahmaputra branch
- Run CI on intel-pod6 against master branch
- Configure functest against both branches on both PODs
- Enable yardstick against both branches on both PODs
- Comment out additional controllers until Arno scenario is verified
- Rename OPNFV_FEATURE to DEPLOY_SCENARIO
Please note that there are some duplications which need to be taken
care of in a separate patch.
Change-Id: Ic3deb77692cdb0908808fdb21098af77b937b831
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 44221431d..f844b1631 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -20,15 +20,19 @@ #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- -# Current Mapping -#-------------------------------- -# everything runs against master branch +# brahmaputra #-------------------------------- pod: + - intel-pod5: + installer: joid + <<: *brahmaputra +#-------------------------------- +# master +#-------------------------------- - huawei-us-deploy-bare-1: installer: compass <<: *master - - intel-pod5: + - intel-pod6: installer: joid <<: *master - intel-us-deploy-virtual-2: @@ -50,45 +54,6 @@ installer: joid <<: *master #-------------------------------- -# Milestone E Mapping -# !!!DO NOT ENABLE!!! -#-------------------------------- -# brahmaputra -#-------------------------------- -# - huawei-us-deploy-bare-1: -# installer: compass -# <<: *brahmaputra -# - intel-pod5: -# installer: joid -# <<: *brahmaputra -# - opnfv-jump-1: -# installer: apex -# <<: *brahmaputra -# - opnfv-jump-2: -# installer: fuel -# <<: *brahmaputra -#-------------------------------- -# master -#-------------------------------- -# - ericsson-pod2: -# installer: fuel -# <<: *master -# - intelpod2-jumphost: -# installer: apex -# <<: *master -# - intel-pod6: -# installer: joid -# <<: *master -# - intel-pod8: -# installer: compass -# <<: *master -# - orange-test1: -# installer: fuel -# <<: *master -# - orange-pod2: -# installer: joid -# <<: *master -#-------------------------------- testsuite: - 'daily' |