diff options
| author |   Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2018-03-13 11:00:12 +0100 |
|---|---|---|
| committer | Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> | 2018-03-20 09:18:22 +0100 |
| commit | 5dc7b76e38019c059cea159769cdb2c37af98ded (patch) | |
| tree | e86406799ff9dd3dcd3d3b9be78d9bc3c2592f8b /xci/playbooks/roles/prepare-functest | |
| parent | f6f8a157851264d038a500707cbd5f46d0862057 (diff) | |
display the correct deploy scenario for the functest run
Change-Id: I0b8a6d9409d95033839bdc5b3fbe9d1cbbdf4b7c
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
Diffstat (limited to 'xci/playbooks/roles/prepare-functest')
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index db3daa54..a0ac9970 100644 --- a/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 @@ -1,7 +1,7 @@ #!/bin/bash # Variables that we need to pass from XCI to functest -XCI_ENV=(INSTALLER_TYPE DEPLOY_SCENARIO XCI_FLAVOR OPENSTACK_OSA_VERSION) +XCI_ENV=(INSTALLER_TYPE XCI_FLAVOR) source /root/openrc @@ -22,6 +22,14 @@ if [[ -e /root/xci.env ]]; then for x in ${XCI_ENV[@]}; do grep "^${x}=" /root/xci.env >> /root/env done + # Parse the XCI's DEPLOY_SCENARIO and XCI_FLAVOR variables and + # set the functest container's DEPLOY_SCENARIO variable in the + # following format <scenario>-<flavor>. But the XCI's mini flavor + # is converted into noha. + DEPLOY_SCENARIO=`grep -Po '(?<=DEPLOY_SCENARIO=).*' /root/xci.env` + XCI_FLAVOR=`grep -Po '(?<=XCI_FLAVOR=).*' /root/xci.env` + XCI_FLAVOR=${XCI_FLAVOR/mini/noha} + echo "DEPLOY_SCENARIO=$DEPLOY_SCENARIO-$XCI_FLAVOR" >> /root/env fi # Dump the env file |