diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-20 13:17:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-20 13:17:57 +0000 |
| commit | c7fd1fe87d8ae59757cefc79fe73ef249dd7952c (patch) | |
| tree | b1fa9ce5557f56c74a318053fbf8cc14fa5430a1 | |
| parent | 6b7f320c96e77fee0bc1d9d5b42e14a1271a37d1 (diff) | |
| parent | 5dc7b76e38019c059cea159769cdb2c37af98ded (diff) | |
Merge "display the correct deploy scenario for the functest run"
| -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 |