diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-05-23 14:45:33 -0700 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-05-23 14:46:10 -0700 |
| commit | e081553a506a57d238bb3f1691abcae46175f99a (patch) | |
| tree | 6a2549ff78876ad10da25c64c9184eea2131b7b9 | |
| parent | f1a3fa578ce4770d227ffa43237da691af47e333 (diff) | |
Reorder scenarios in opnfv-scenario-requirements.yml
Put OpenStack scenarios and Kubernetes scenarios together.
installer-type:kubespray
deploy-scenario:k8-canal-nofeature
Change-Id: I6a47b0b3703e30ac9a2be53012687217a085ee88
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index a0eccb24..8688d3cc 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -11,11 +11,13 @@ # OPNFV scenarios participating in XCI must create their own entry in this file so # XCI can make use of them. # -- scenario: os-odl-sfc + +# OpenStack based scenarios +- scenario: os-nosdn-nofeature scm: git - src: https://gerrit.opnfv.org/gerrit/sfc + src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios version: master - role: scenarios/os-odl-sfc/role/os-odl-sfc + role: scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature installers: - installer: osa flavors: @@ -25,12 +27,13 @@ distros: - opensuse - ubuntu + - centos -- scenario: os-nosdn-nofeature +- scenario: os-odl-nofeature scm: git src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios version: master - role: scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature + role: scenarios/os-odl-nofeature/role/os-odl-nofeature installers: - installer: osa flavors: @@ -40,13 +43,12 @@ distros: - opensuse - ubuntu - - centos -- scenario: os-odl-nofeature +- scenario: os-odl-sfc scm: git - src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios + src: https://gerrit.opnfv.org/gerrit/sfc version: master - role: scenarios/os-odl-nofeature/role/os-odl-nofeature + role: scenarios/os-odl-sfc/role/os-odl-sfc installers: - installer: osa flavors: @@ -57,37 +59,39 @@ - opensuse - ubuntu -- scenario: k8-nosdn-nofeature +- scenario: os-odl-bgpvpn scm: git - src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios + src: https://gerrit.opnfv.org/gerrit/sdnvpn version: master - role: scenarios/k8-nosdn-nofeature/role/k8-nosdn-nofeature + role: scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn installers: - - installer: kubespray + - installer: osa flavors: - - aio - ha - mini - noha distros: - ubuntu - centos - - opensuse -- scenario: os-odl-bgpvpn + +# Kubernetes based scenarios +- scenario: k8-nosdn-nofeature scm: git - src: https://gerrit.opnfv.org/gerrit/sdnvpn + src: https://gerrit.opnfv.org/gerrit/releng-xci-scenarios version: master - role: scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn + role: scenarios/k8-nosdn-nofeature/role/k8-nosdn-nofeature installers: - - installer: osa + - installer: kubespray flavors: + - aio - ha - mini - noha distros: - ubuntu - centos + - opensuse - scenario: k8-canal-nofeature scm: git |