all install run

apache · Nov 29, 2019 · 4b10b57 · 4b10b57
1 parent 50b4b27
commit 4b10b57
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 55 deletions.
diff --git a/.github/workflows/istio-mixer-ci.yaml b/.github/workflows/istio-mixer-ci.yaml
@@ -36,8 +36,8 @@ jobs:
         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: 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

diff --git a/install/deploy/demo-deploy.sh b/install/deploy/demo-deploy.sh
@@ -23,27 +23,10 @@ set -e
 BOOKINFO_VERSION="1.3"
 kubectl label namespace default istio-injection=enabled
 kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-${BOOKINFO_VERSION}/samples/bookinfo/platform/kube/bookinfo.yaml
-#kubectl apply -f ./bookinfo.yaml
-#kubectl get deploy | grep -E 'details|productpage|ratings|reviews' | awk '{print $1}' | while read deploy
-#do
-#  for i in {1..5} ;do
-#     echo "******************* $i time ***************************"
-#     kubectl get deploy -o wide
-#     echo "*********************** pod describe ******************************"
-#     kubectl describe pod `kubectl get pod -o wide | grep $deploy | awk '{print $1}'`
-#     echo "************************* deploy describe ****************************"
-#     kubectl describe deploy $deploy
-#     kubectl get event -o wide
-#     free -lh
-#     sleep 10
-#  done
-#done
 
 # check status
 kubectl get deploy  | grep -E 'details|productpage|ratings|reviews' | awk '{print "deployment/"$1}' | while read deploy
 do
-  sleep 60
-  kubectl get event -o wide
   kubectl wait ${deploy} --for condition=available --timeout=600s
 done
 

diff --git a/install/deploy/istio-deploy.sh b/install/deploy/istio-deploy.sh
@@ -77,16 +77,6 @@ deploy_istio() {
   cd $CHART_DIR
 
   helm install istio istio -n ${NAMESPACE} -f istio/values-istio-skywalking.yaml
-#          --set prometheus.enabled=false --set pilot.autoscaleEnabled=false \
-#          --set gateways.istio-ingressgateway.autoscaleEnabled=false --set mixer.policy.autoscaleEnabled=false \
-#          --set mixer.telemetry.autoscaleEnabled=false \
-#          --set gateways.istio-ingressgateway.resources.requests={},gateways.istio-ingressgateway.resources.limits={}, \
-#          --set pilot.resources.requests={},pilot.resources.limits={} \
-#          --set mixer.telemetry.resources.requests={},mixer.telemetry.resources.limits={} \
-#          --set pilot.resources.requests={},pilot.resources.limits={} \
-#          --set global.defaultResources.requests={},global.defaultResources.limits={} \
-#          --set global.proxy.init.resources.requests={},global.proxy.init.resources.limits={} \
-#          --set global.proxy.resources.requests={},global.proxy.resources.limits={}
 
   check() {
      kubectl -n ${NAMESPACE}  get deploy | grep istio | awk '{print "deployment/"$1}' | while read line ;

diff --git a/install/deploy/skywalking-deploy.sh b/install/deploy/skywalking-deploy.sh
@@ -51,36 +51,13 @@ sudo sysctl -w vm.max_map_count=262144
 sudo sysctl -w vm.drop_caches=1
 sudo sysctl -w vm.drop_caches=3
 
+TAG=`env | grep OAP_TAG | sed 's/OAP_TAG=//g'`
+
 helm -n $DPELOY_NAMESPACE install skywalking skywalking --set oap.istio.adapter.enabled=$MIXER_ENABLED \
-        --set oap.envoy.als.enabled=$ALS_ENABLED --set oap.replicas=1
+        --set oap.envoy.als.enabled=$ALS_ENABLED --set oap.replicas=1 --set oap.image.tag=$TAG
 
 for component in $NEED_CHECK_PREFIX"oap" ; do
-#  for i in {1..10} ;do
-#    echo "*****************$i time*************"
-#    free -lh
-#    echo "*****************************************************"
-#    kubectl -n ${DPELOY_NAMESPACE} get deploy -o wide
-#    echo "*****************************************************"
-#    if [[ `kubectl -n ${DPELOY_NAMESPACE} get deploy -o wide | grep skywalking-elasticsearch | awk '{print $2}'` == "1/1" ]] ;then
-#      sleep 10
-#      kubectl -n ${DPELOY_NAMESPACE} logs `kubectl -n ${DPELOY_NAMESPACE} get pod |grep skywalking-elasticsearch | awk '{print $1}'` --all-containers=true
-#    fi
-#    echo "*****************************************************"
-#    kubectl -n ${DPELOY_NAMESPACE} get jobs -o wide
-#    echo "*****************************************************"
-#    kubectl -n ${DPELOY_NAMESPACE} get event  | grep -v "istio"
-#    kubectl -n ${DPELOY_NAMESPACE} describe pod `kubectl -n ${DPELOY_NAMESPACE} get pod |grep elasticsearch | awk '{print $1}'`
-#    echo "*****************************************************"
-#    kubectl -n ${DPELOY_NAMESPACE} describe pod `kubectl -n ${DPELOY_NAMESPACE} get pod |grep skywalking-skywalking-oap | awk '{print $1}'`
-#    sleep 10
-#  done
-#  echo "*****************************************************"
-#  sleep 10
-
-  #kubectl -n ${DPELOY_NAMESPACE} logs `kubectl -n ${DPELOY_NAMESPACE} get pod |grep skywalking-skywalking-oap | awk '{print $1}'` --all-containers=true
-  #kubectl -n ${DPELOY_NAMESPACE} logs $component
   kubectl -n ${DPELOY_NAMESPACE} wait $component --for condition=available --timeout=600s
-#  kubectl -n ${DPELOY_NAMESPACE} rollout status $component --timeout 10m
 done
 
 echo "SkyWalking deployed successfully"
diff --git a/test/e2e-mesh/e2e-istio/scripts/compile_build.sh b/test/e2e-mesh/e2e-istio/scripts/compile_build.sh
@@ -22,6 +22,7 @@
 set -e
 
 TAG=`date +"%Y-%m-%d"`
+export OAP_TAG="$TAG"
 
 git rev-parse HEAD
 git submodule init