diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-12-14 22:54:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-14 22:54:10 +0000 |
| commit | 39d9f4db802ade0b8be8216ae124b1f42f7a7a78 (patch) | |
| tree | 509a98109391e19815b5f8b866c647361e52146c | |
| parent | 8ad2a77c0122f32835cd4d66dc4588b89261a2db (diff) | |
| parent | dc2856dde1760d408b03fd95a104133b6efd9c10 (diff) | |
Merge "xci: Add flavor information for scenarios"
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 13 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 20 |
2 files changed, 32 insertions, 1 deletions
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index 8192fe29..036a8a7c 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -16,14 +16,25 @@ src: https://gerrit.opnfv.org/gerrit/sfc version: master role: scenarios/os-odl-sfc/role/os-odl-sfc + flavors: + - ha + - mini + - noha - scenario: os-nosdn-nofeature scm: git src: https://git.opnfv.org/releng-xci version: master role: xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature + flavors: + - ha + - mini + - noha - scenario: os-odl-nofeature scm: git src: https://git.opnfv.org/releng-xci version: master role: xci/scenarios/os-odl-nofeature/role/os-odl-nofeature - + flavors: + - ha + - mini + - noha diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml index 11aee8ee..173b825e 100644 --- a/xci/playbooks/get-opnfv-scenario-requirements.yml +++ b/xci/playbooks/get-opnfv-scenario-requirements.yml @@ -83,6 +83,26 @@ loop_control: label: "{{ item.item.scenario }}" + - name: Determine if selected {{ OPNFV_SCENARIO }} scenario can be deployed + set_fact: + deploy_scenario_on_flavor: XCI_FLAVOR in item.flavors + when: OPNFV_SCENARIO == item.scenario + with_items: "{{ scenarios }}" + loop_control: + label: "{{ item.scenario }}" + + - name: Fail if {{ XCI_FLAVOR }} is not supported in {{ OPNFV_SCENARIO }} + fail: + msg: + - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + - ERROR! The {{ OPNFV_SCENARIO }} scenario does not support the {{ XCI_FLAVOR }} + - '' + - This is a great chance for you to contribute to XCI ;-) + - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + - '' + when: + - not deploy_scenario_on_flavor + vars: ansible_python_interpreter: "/usr/bin/python" scenarios: "{{ lookup('file', scenario_file) | from_yaml }}" |