From adb631a4007b26131b49288d576c9dc87c45dbb4 Mon Sep 17 00:00:00 2001
From: meimei <meimei@huawei.com>
Date: Tue, 17 Nov 2015 22:00:40 -0800
Subject: [functest] modify functest prepare scripts to adapt compass
JIRA: COMPASS-157
Change-Id: I81f1f41ff7a10e9bcea1cb46b9dc2e2f8e169bae
Signed-off-by: meimei <meimei@huawei.com>
---
docker/prepare_env.sh | 5 +++--
1 file 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."
--
cgit