diff --git a/test/kubemark/common.sh b/test/kubemark/common.sh index 9c0cd375eed..a886115dc8f 100644 --- a/test/kubemark/common.sh +++ b/test/kubemark/common.sh @@ -22,12 +22,12 @@ source "${KUBE_ROOT}/cluster/lib/util.sh" # what what is default in hack/lib/etcd.sh # To avoid it, if it is empty, we set it to 'avoid-overwrite' and # clean it after that. -if [ -z "${ETCD_IMAGE}" ]; then - ETCD_IMAGE="avoid-overwrite" +if [ -z "${ETCD_VERSION:-}" ]; then + ETCD_VERSION="avoid-overwrite" fi source "${KUBE_ROOT}/hack/lib/init.sh" -if [ "${ETCD_IMAGE}" == "avoid-overwrite" ]; then - ETCD_IMAGE="" +if [ "${ETCD_VERSION:-}" == "avoid-overwrite" ]; then + ETCD_VERSION="" fi detect-project &> /dev/null diff --git a/test/kubemark/start-kubemark.sh b/test/kubemark/start-kubemark.sh index 58aa0be5746..37fa59c2516 100755 --- a/test/kubemark/start-kubemark.sh +++ b/test/kubemark/start-kubemark.sh @@ -25,37 +25,32 @@ source "${KUBE_ROOT}/test/kubemark/common.sh" function writeEnvironmentFile() { cat > "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <> "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" <> /srv/kubernetes/known_tokens.csv\" && \ sudo bash -c \"echo ${password},admin,admin > /srv/kubernetes/basic_auth.csv\"" -writeEnvironmentFile gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \ "${SERVER_BINARY_TAR}" \ diff --git a/test/kubemark/stop-kubemark.sh b/test/kubemark/stop-kubemark.sh index 0d894250aaa..0ee2477deff 100755 --- a/test/kubemark/stop-kubemark.sh +++ b/test/kubemark/stop-kubemark.sh @@ -57,6 +57,4 @@ rm "${RESOURCE_DIRECTORY}/ca.crt" \ "${RESOURCE_DIRECTORY}/kubecfg.crt" \ "${RESOURCE_DIRECTORY}/kubecfg.key" \ "${RESOURCE_DIRECTORY}/hollow-node.json" \ - "${RESOURCE_DIRECTORY}/apiserver_flags" \ - "${RESOURCE_DIRECTORY}/controllers_flags" \ - "${RESOURCE_DIRECTORY}/scheduler_flags" &> /dev/null || true + "${RESOURCE_DIRECTORY}/kubemark-master-env.sh" &> /dev/null || true