From fdb816c799d468458c51ee019916b9afb75e4528 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Thu, 12 Mar 2020 10:33:11 +0800 Subject: [PATCH] Update MiniKube for CI process (#4495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update pre.sh * add if func Signed-off-by: Gao Hongtao * Reorder steps Signed-off-by: Gao Hongtao * Upgrade minikube to 1.8.0 Signed-off-by: Gao Hongtao Co-authored-by: 吴晟 Wu Sheng --- .github/workflows/istio-mixer-ci.yaml | 5 +++-- test/e2e-mesh/e2e-istio/scripts/minikube.sh | 2 +- test/e2e-mesh/e2e-istio/scripts/pre.sh | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/istio-mixer-ci.yaml b/.github/workflows/istio-mixer-ci.yaml index 228843c53..82b4d2c5b 100644 --- a/.github/workflows/istio-mixer-ci.yaml +++ b/.github/workflows/istio-mixer-ci.yaml @@ -43,14 +43,14 @@ jobs: run: | bash ${SCRIPTS_DIR}/pre.sh mkdir -p ${LOG_DIR} + - name: Compile all and Build docker image + run: bash ${SCRIPTS_DIR}/compile_build.sh - name: Start minikube run: bash ${SCRIPTS_DIR}/minikube.sh start > ${LOG_DIR}/minikube-start-log.txt 2>&1 & - name: Wating minikube ready run: bash ${SCRIPTS_DIR}/minikube.sh wait - name: Setup tunnel run: minikube tunnel --log_dir=${LOG_DIR} & - - name: Compile all and Build docker image - run: bash ${SCRIPTS_DIR}/compile_build.sh - name: Istio install run: bash ${INSTALL_SCRIPTS_DIR}/istio-deploy.sh - name: SW And ES install @@ -58,6 +58,7 @@ jobs: - name: Bookinfo demo install run: bash ${INSTALL_SCRIPTS_DIR}/demo-deploy.sh - uses: actions/upload-artifact@v1.0.0 + if: always() with: name: logs path: /tmp/skywalking diff --git a/test/e2e-mesh/e2e-istio/scripts/minikube.sh b/test/e2e-mesh/e2e-istio/scripts/minikube.sh index 31309280e..73daf67ca 100755 --- a/test/e2e-mesh/e2e-istio/scripts/minikube.sh +++ b/test/e2e-mesh/e2e-istio/scripts/minikube.sh @@ -100,7 +100,7 @@ function startMinikubeNone() { sudo -E minikube config set WantUpdateNotification false sudo -E minikube config set WantReportErrorPrompt false - sudo -E minikube start --kubernetes-version=${K8S_VER#k8s-} --vm-driver=none + sudo -E minikube start --kubernetes-version=${K8S_VER#k8s-} --driver=none } function stopMinikube() { diff --git a/test/e2e-mesh/e2e-istio/scripts/pre.sh b/test/e2e-mesh/e2e-istio/scripts/pre.sh index c2b8eaaa3..d9f48d837 100755 --- a/test/e2e-mesh/e2e-istio/scripts/pre.sh +++ b/test/e2e-mesh/e2e-istio/scripts/pre.sh @@ -28,7 +28,7 @@ fi MINIKUBEVERESION=$2 if [[ "${MINIKUBEVERESION}" == "" ]]; then - MINIKUBEVERESION="minikube-v1.4.0" + MINIKUBEVERESION="minikube-v1.8.0" fi K8SVERSION=$3 @@ -79,4 +79,5 @@ sudo add-apt-repository \ $(lsb_release -cs) \ stable" sudo apt-get update -sudo apt-get install -y docker-ce +sudo apt-cache madison docker-ce +sudo apt-get install -y docker-ce=5:19.03.8~3-0~ubuntu-xenial docker-ce-cli=5:19.03.8~3-0~ubuntu-xenial containerd.io