Integrate inband os-nosdn-ovs scenario

Change-Id: I9253edf028fce571e04f9f82103a94952e05d2d4
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>

diff --git a/xci/config/env-vars b/xci/config/env-vars
index c399707..a7d8696 100755 (executable)
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -19,3 +19,4 @@ export XCI_ANSIBLE_PIP_VERSION=2.3.2.0
 export ANSIBLE_HOST_KEY_CHECKING=False
 # subject of the certificate
 export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"}
+export OPNFV_SCENARIO=${OPNFV_SCENARIO:-"os-nosdn-nofeature"}

diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index ee9b2ba..cde6467 100644 (file)
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -16,3 +16,9 @@
   src: https://gerrit.opnfv.org/gerrit/sfc
   version: master
   role: scenarios/os-odl-sfc/role/os-odl-sfc
+- scenario: os-nosdn-ovs
+  scm: git
+  src: https://git.opnfv.org/releng-xci
+  version: master
+  role: xci/scenarios/os-nosdn-ovs/role/os-nosdn-ovs
+

diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml
index e7bd7dc..da5baf0 100644 (file)
--- a/xci/playbooks/bootstrap-scenarios.yml
+++ b/xci/playbooks/bootstrap-scenarios.yml
@@ -8,3 +8,8 @@
 #   include_role:
 #     name: "foobar"
 #   when: OPNFV_SCENARIO == "foobar"
+
+- name: Prepare everything to run the os-nosdn-ovs scenario
+  include_role:
+    name: "os-nosdn-ovs"
+  when: OPNFV_SCENARIO == 'os-nosdn-ovs'

diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 0cca117..5378d13 100644 (file)
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -34,6 +34,7 @@ XCI_EXTRA_VARS_PATH: "{{ lookup('env', 'XCI_EXTRA_VARS_PATH') }}"
 XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}"
 XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}"
 RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}"
+OPNFV_SCENARIO: "{{ lookup('env','OPNFV_SCENARIO') }}"
 
 # install docker on opnfv host only if we are running as part of CI
 opnfv_required_packages: