oap image

apache · Nov 29, 2019 · 7eccfc5 · 7eccfc5
1 parent 4d276a2
commit 7eccfc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/install/deploy/skywalking-deploy.sh b/install/deploy/skywalking-deploy.sh
@@ -52,11 +52,13 @@ sudo sysctl -w vm.drop_caches=1
 sudo sysctl -w vm.drop_caches=3
 
 TAG=`env | grep OAP_TAG | sed 's/OAP_TAG=//g'`
+IMAGE=`env | grep OAP_REPOSITORY | sed 's/OAP_REPOSITORY=//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.image.tag=$TAG
+        --set oap.envoy.als.enabled=$ALS_ENABLED --set oap.replicas=1 --set oap.image.tag=$TAG,oap.image.repository=$IMAGE
 
 for component in $NEED_CHECK_PREFIX"oap" ; do
+  kubectl get deploy -o wide
   kubectl -n ${DPELOY_NAMESPACE} wait $component --for condition=available --timeout=600s
 done
 

diff --git a/test/e2e-mesh/e2e-istio/scripts/compile_build.sh b/test/e2e-mesh/e2e-istio/scripts/compile_build.sh
@@ -23,6 +23,7 @@ set -e
 
 TAG=`date +"%Y-%m-%d"`
 export OAP_TAG="$TAG"
+export OAP_REPOSITORY="skywalking/oap"
 
 git rev-parse HEAD
 git submodule init