[skywalking] branch minikube updated: Add tunnel to provie loadbalancer

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch minikube
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/minikube by this push:
     new 3f5bcc1  Add tunnel to provie loadbalancer
3f5bcc1 is described below

commit 3f5bcc1eb558cbd482aaa301547806d3426029d0
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Tue Nov 12 00:09:36 2019 +0800

    Add tunnel to provie loadbalancer
---
 .github/workflows/istio-mixer-ci.yaml          | 10 ++++--
 test/e2e-kubernetes/istio-mixer-adapter/run.sh | 50 --------------------------
 test/scripts/minikube.sh                       |  2 +-
 3 files changed, 8 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/istio-mixer-ci.yaml b/.github/workflows/istio-mixer-ci.yaml
index 22d567b..3f90144 100644
--- a/.github/workflows/istio-mixer-ci.yaml
+++ b/.github/workflows/istio-mixer-ci.yaml
@@ -4,12 +4,16 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-16.04
-
+    env:
+      SCRIPTS_DIR=./test/scripts
     steps:
       - uses: actions/checkout@v1
       - name: Prepare enviroment
         run: bash ./test/scripts/pre.sh
       - name: Start minikube
-        run: bash ./test/scripts/minikube.sh start
+        run: bash ${SCRIPTS_DIR}/minikube.sh start &
+      - name: Wating minikube ready
+          run: bash ${SCRIPTS_DIR}/minikube.sh wait
+      - name: Setup tunnel
+        run: minikube tunnel --log_dir=/tmp/skywalking &
diff --git a/test/e2e-kubernetes/istio-mixer-adapter/run.sh b/test/e2e-kubernetes/istio-mixer-adapter/run.sh
deleted file mode 100755
index 400a842..0000000
--- a/test/e2e-kubernetes/istio-mixer-adapter/run.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-set -ex
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-ROOT=${DIR}/../../..
-SCRIPTS_DIR=${ROOT}/test/scripts
-
-CONTAINER_NAME=$1
-if [[ "${CONTAINER_NAME}" == "" ]]; then
-    CONTAINER_NAME="e2e-istio-mixer-adapter"
-fi
-
-# Clean old container
-${SCRIPTS_DIR}/clean.sh ${CONTAINER_NAME}
-
-
-docker run -itd --name ${CONTAINER_NAME} -v ${ROOT}:/skywalking buildpack-deps:16.04-curl /bin/bash
-
-CONTAINER_SCRIPTS_DIR=/skywalking/test/scripts
-
-# Install all requirements
-docker exec -it ${CONTAINER_NAME} ${CONTAINER_SCRIPTS_DIR}/pre.sh
-
-docker exec -it ${CONTAINER_NAME} ${CONTAINER_SCRIPTS_DIR}/minikube.sh startMinikube &
-
-docker exec -it ${CONTAINER_NAME} ${CONTAINER_SCRIPTS_DIR}/minikube.sh waitMinikube
-
-docker exec -it ${CONTAINER_NAME} ${CONTAINER_SCRIPTS_DIR}/minikube.sh stopMinikube
-
-${SCRIPTS_DIR}/clean.sh ${CONTAINER_NAME}
diff --git a/test/scripts/minikube.sh b/test/scripts/minikube.sh
index be2924b..4a324c7 100755
--- a/test/scripts/minikube.sh
+++ b/test/scripts/minikube.sh
@@ -30,7 +30,7 @@ function waitMinikube() {
   set +e
   kubectl cluster-info
   # This for loop waits until kubectl can access the api server that Minikube has created.
-  for _ in {1..12}; do # Timeout for 120 seconds.
+  for _ in {1..24}; do # Timeout for 240 seconds.
     kubectl get po --all-namespaces
     if [ $? -ne 1 ]; then
       break