From 19adf0cd7e105bc88f1327f0bcbb77e31a552852 Mon Sep 17 00:00:00 2001 From: Rahul Bhati Date: Tue, 2 Feb 2021 12:25:03 +0530 Subject: [PATCH] Fixing issue of pulling docker image twice in CI (#1903) Co-authored-by: Vishal --- test/kind_CI.sh | 34 ++++++++++++++++++++++++++++++++++ test/run_test.sh | 35 +---------------------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/test/kind_CI.sh b/test/kind_CI.sh index 991a9abd..4fc8b7c1 100755 --- a/test/kind_CI.sh +++ b/test/kind_CI.sh @@ -14,6 +14,40 @@ echo "source test_utils done" dump_system_info +export FUNCTION_NAMESPACE=fission-function +export FISSION_NAMESPACE=fission +export FISSION_ROUTER=127.0.0.1:8888 +export NODE_RUNTIME_IMAGE=fission/node-env-12.16:1.11.0 +export NODE_BUILDER_IMAGE=fission/node-builder-12.16:1.11.0 +export PYTHON_RUNTIME_IMAGE=fission/python-env +export PYTHON_BUILDER_IMAGE=fission/python-builder +export GO_RUNTIME_IMAGE=fission/go-env-1.12 +export GO_BUILDER_IMAGE=fission/go-builder-1.12 +export JVM_RUNTIME_IMAGE=fission/jvm-env +export JVM_BUILDER_IMAGE=fission/jvm-builder +export JVM_JERSEY_RUNTIME_IMAGE=fission/jvm-jersey-env +export JVM_JERSEY_BUILDER_IMAGE=fission/jvm-jersey-builder +export TS_RUNTIME_IMAGE=fission/tensorflow-serving-env +export CONTROLLER_IP=127.0.0.1:8889 +export FISSION_NATS_STREAMING_URL=http://defaultFissionAuthToken@127.0.0.1:8890 + +echo "Pulling env and builder images" +docker pull $NODE_RUNTIME_IMAGE && kind load docker-image $NODE_RUNTIME_IMAGE --name kind +docker pull $NODE_BUILDER_IMAGE && kind load docker-image $NODE_BUILDER_IMAGE --name kind +docker system prune -a -f +docker pull $PYTHON_RUNTIME_IMAGE && kind load docker-image $PYTHON_RUNTIME_IMAGE --name kind +docker pull $PYTHON_BUILDER_IMAGE && kind load docker-image $PYTHON_BUILDER_IMAGE --name kind +docker pull $JVM_RUNTIME_IMAGE && kind load docker-image $JVM_RUNTIME_IMAGE --name kind +docker pull $JVM_BUILDER_IMAGE && kind load docker-image $JVM_BUILDER_IMAGE --name kind +docker system prune -a -f +docker pull $JVM_JERSEY_RUNTIME_IMAGE && kind load docker-image $JVM_JERSEY_RUNTIME_IMAGE --name kind +docker pull $JVM_JERSEY_BUILDER_IMAGE && kind load docker-image $JVM_JERSEY_BUILDER_IMAGE --name kind +docker pull $GO_RUNTIME_IMAGE && kind load docker-image $GO_RUNTIME_IMAGE --name kind +docker pull $GO_BUILDER_IMAGE && kind load docker-image $GO_BUILDER_IMAGE --name kind +docker system prune -a -f +docker pull $TS_RUNTIME_IMAGE && kind load docker-image $TS_RUNTIME_IMAGE --name kind +echo "Successfully pull env and builder images" + # run tests without newdeploy in parallel. export FAILURES=0 diff --git a/test/run_test.sh b/test/run_test.sh index 69c02045..fd69eeb9 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -11,46 +11,13 @@ # TIMEOUT Timeout for each job. (default: 0 (no timeout)) # set -euo pipefail + source $(dirname $BASH_SOURCE)/init_tools.sh ROOT=$(readlink -f $(dirname $0)/..) LOG_DIR=${LOG_DIR:-$ROOT/test/logs} JOBS=${JOBS:-1} -export FUNCTION_NAMESPACE=fission-function -export FISSION_NAMESPACE=fission -export FISSION_ROUTER=127.0.0.1:8888 -export NODE_RUNTIME_IMAGE=fission/node-env-12.16:1.11.0 -export NODE_BUILDER_IMAGE=fission/node-builder-12.16:1.11.0 -export PYTHON_RUNTIME_IMAGE=fission/python-env -export PYTHON_BUILDER_IMAGE=fission/python-builder -export GO_RUNTIME_IMAGE=fission/go-env-1.12 -export GO_BUILDER_IMAGE=fission/go-builder-1.12 -export JVM_RUNTIME_IMAGE=fission/jvm-env -export JVM_BUILDER_IMAGE=fission/jvm-builder -export JVM_JERSEY_RUNTIME_IMAGE=fission/jvm-jersey-env -export JVM_JERSEY_BUILDER_IMAGE=fission/jvm-jersey-builder -export TS_RUNTIME_IMAGE=fission/tensorflow-serving-env -export CONTROLLER_IP=127.0.0.1:8889 -export FISSION_NATS_STREAMING_URL=http://defaultFissionAuthToken@127.0.0.1:8890 - -echo "Pulling env and builder images" -docker pull $NODE_RUNTIME_IMAGE && kind load docker-image $NODE_RUNTIME_IMAGE --name kind -docker pull $NODE_BUILDER_IMAGE && kind load docker-image $NODE_BUILDER_IMAGE --name kind -docker system prune -a -f -docker pull $PYTHON_RUNTIME_IMAGE && kind load docker-image $PYTHON_RUNTIME_IMAGE --name kind -docker pull $PYTHON_BUILDER_IMAGE && kind load docker-image $PYTHON_BUILDER_IMAGE --name kind -docker pull $JVM_RUNTIME_IMAGE && kind load docker-image $JVM_RUNTIME_IMAGE --name kind -docker pull $JVM_BUILDER_IMAGE && kind load docker-image $JVM_BUILDER_IMAGE --name kind -docker system prune -a -f -docker pull $JVM_JERSEY_RUNTIME_IMAGE && kind load docker-image $JVM_JERSEY_RUNTIME_IMAGE --name kind -docker pull $JVM_JERSEY_BUILDER_IMAGE && kind load docker-image $JVM_JERSEY_BUILDER_IMAGE --name kind -docker pull $GO_RUNTIME_IMAGE && kind load docker-image $GO_RUNTIME_IMAGE --name kind -docker pull $GO_BUILDER_IMAGE && kind load docker-image $GO_BUILDER_IMAGE --name kind -docker system prune -a -f -docker pull $TS_RUNTIME_IMAGE && kind load docker-image $TS_RUNTIME_IMAGE --name kind -echo "Successfully pull env and builder images" - main() { if [ $# -eq 0 ]; then args=$(find_executable $ROOT/test/tests -iname 'test_*')