This is an automated email from the ASF dual-hosted git repository. rmetzger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new 3dedb85 [FLINK-18239][e2e] Pin minikube version to v1.8.2 3dedb85 is described below commit 3dedb85000d722620d65ef41e791a8e1d1a910e2 Author: wangyang0918 <danrtsey...@alibaba-inc.com> AuthorDate: Wed Jun 10 20:19:06 2020 +0800 [FLINK-18239][e2e] Pin minikube version to v1.8.2 --- .../test-scripts/common_kubernetes.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh index d6fcacf..e553bfe 100755 --- a/flink-end-to-end-tests/test-scripts/common_kubernetes.sh +++ b/flink-end-to-end-tests/test-scripts/common_kubernetes.sh @@ -24,6 +24,8 @@ CONTAINER_SCRIPTS=${END_TO_END_DIR}/test-scripts/container-scripts MINIKUBE_START_RETRIES=3 MINIKUBE_START_BACKOFF=5 RESULT_HASH="e682ec6622b5e83f2eb614617d5ab2cf" +MINIKUBE_VERSION="v1.8.2" +MINIKUBE_PATH="/usr/local/bin/minikube-$MINIKUBE_VERSION" NON_LINUX_ENV_NOTE="****** Please start/stop minikube manually in non-linux environment. ******" @@ -42,15 +44,15 @@ function setup_kubernetes_for_linux { chmod +x kubectl && sudo mv kubectl /usr/local/bin/ fi # Download minikube. - if ! [ -x "$(command -v minikube)" ]; then - echo "Installing minikube ..." - curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.8.2/minikube-linux-$arch && \ - chmod +x minikube && sudo mv minikube /usr/local/bin/ + if ! [ -x "$(command -v minikube)" ] || ! [[ $(minikube version) =~ "$MINIKUBE_VERSION" ]]; then + echo "Installing minikube to $MINIKUBE_PATH ..." + curl -Lo minikube https://storage.googleapis.com/minikube/releases/$MINIKUBE_VERSION/minikube-linux-$arch && \ + chmod +x minikube && sudo mv minikube $MINIKUBE_PATH fi } function check_kubernetes_status { - minikube status + $MINIKUBE_PATH status return $? } @@ -73,7 +75,7 @@ function start_kubernetes_if_not_running { # here. # Similarly, the kubelets are marking themself as "low disk space", # causing Flink to avoid this node (again, failing the test) - sudo CHANGE_MINIKUBE_NONE_USER=true minikube start --vm-driver=none \ + sudo CHANGE_MINIKUBE_NONE_USER=true $MINIKUBE_PATH start --vm-driver=none \ --extra-config=kubelet.image-gc-high-threshold=99 \ --extra-config=kubelet.image-gc-low-threshold=98 \ --extra-config=kubelet.minimum-container-ttl-duration=120m \ @@ -81,7 +83,7 @@ function start_kubernetes_if_not_running { --extra-config=kubelet.eviction-soft="memory.available<5Mi,nodefs.available<2Mi,imagefs.available<2Mi" \ --extra-config=kubelet.eviction-soft-grace-period="memory.available=2h,nodefs.available=2h,imagefs.available=2h" # Fix the kubectl context, as it's often stale. - minikube update-context + $MINIKUBE_PATH update-context fi check_kubernetes_status @@ -101,7 +103,7 @@ function start_kubernetes { exit 1 fi fi - eval $(minikube docker-env) + eval $($MINIKUBE_PATH docker-env) } function stop_kubernetes { @@ -109,7 +111,7 @@ function stop_kubernetes { echo "$NON_LINUX_ENV_NOTE" else echo "Stopping minikube ..." - stop_command="sudo minikube stop" + stop_command="sudo $MINIKUBE_PATH stop" if ! retry_times ${MINIKUBE_START_RETRIES} ${MINIKUBE_START_BACKOFF} "${stop_command}"; then echo "Could not stop minikube. Aborting..." exit 1