diff options
| author |   meimei <meimei@huawei.com> | 2015-11-17 22:00:40 -0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2015-11-18 11:55:59 -0800 |
| commit | adb631a4007b26131b49288d576c9dc87c45dbb4 (patch) | |
| tree | 5efb94b93a5840bb66fe5bb0dcbb771481680438 | |
| parent | 235fc2b1017943734dc853c5e3c48b36f0ba0871 (diff) | |
[functest] modify functest prepare scripts to adapt compass
JIRA: COMPASS-157
Change-Id: I81f1f41ff7a10e9bcea1cb46b9dc2e2f8e169bae
Signed-off-by: meimei <meimei@huawei.com>
| -rwxr-xr-x | docker/prepare_env.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 1b3144a0d..4c944b22c 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -61,10 +61,11 @@ fi info "Checking environment variables INSTALLER_TYPE and INSTALLER_IP" if [ -z ${INSTALLER_TYPE} ]; then error "Environment variable 'INSTALLER_TYPE' is not defined." -elif [ "${INSTALLER_TYPE}" != "fuel" ] && [ "${INSTALLER_TYPE}" != "foreman" ]; then +elif [[ ${INSTALLER_TYPE} =~ ^(fuel|foreman|compass|apex|juju)$ ]]; then + info "INSTALLER_TYPE env variable found: ${INSTALLER_TYPE}" +else error "Invalid environment variable INSTALLER_TYPE=${INSTALLER_TYPE}" fi -info "INSTALLER_TYPE env variable found: ${INSTALLER_TYPE}" if [ -z ${INSTALLER_IP} ]; then error "Environment variable 'INSTALLER_IP' is not defined." |