From 2a0f1fe7aaa93ef1ddcd0f88b90d7d34eed9bb26 Mon Sep 17 00:00:00 2001 From: ryandawsonuk Date: Mon, 2 Dec 2019 11:05:44 +0000 Subject: [PATCH 1/3] build operator image when running e2e locally --- testing/scripts/kind_test_all.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/scripts/kind_test_all.sh b/testing/scripts/kind_test_all.sh index 2e69730360..d86114ab0e 100755 --- a/testing/scripts/kind_test_all.sh +++ b/testing/scripts/kind_test_all.sh @@ -77,6 +77,8 @@ if [[ ${KIND_EXIT_VALUE} -eq 0 ]]; then ## RUNNING TESTS AND CAPTURING ERROR make test TEST_EXIT_VALUE=$? +else + echo "Existing kind cluster or failure starting - ${KIND_EXIT_VALUE}" fi # DELETE KIND CLUSTER From 029f5d761e25f92a24f3c6ef82fcc62f35431a99 Mon Sep 17 00:00:00 2001 From: ryandawsonuk Date: Mon, 2 Dec 2019 11:37:12 +0000 Subject: [PATCH 2/3] this is the key bit - missed in previous commit --- testing/scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/scripts/Makefile b/testing/scripts/Makefile index ca468d933b..95ec22b74f 100644 --- a/testing/scripts/Makefile +++ b/testing/scripts/Makefile @@ -39,7 +39,7 @@ create_namespaces: kubectl create namespace test1 || echo "Namespace test1 already exists" kubectl config set-context $$(kubectl config current-context) --namespace=seldon -kind_setup: install_helm install_ambassador install_seldon create_namespaces +kind_setup: kind_build_images install_helm install_ambassador install_seldon create_namespaces port-forward-ambassador: kubectl port-forward $$(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080 From 114508a472e4aee53ff3bd86a26d74eef1f09d1e Mon Sep 17 00:00:00 2001 From: ryandawsonuk Date: Mon, 2 Dec 2019 12:03:15 +0000 Subject: [PATCH 3/3] try moving the image build call --- testing/scripts/Makefile | 2 +- testing/scripts/kind_test_setup.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/scripts/Makefile b/testing/scripts/Makefile index 95ec22b74f..ca468d933b 100644 --- a/testing/scripts/Makefile +++ b/testing/scripts/Makefile @@ -39,7 +39,7 @@ create_namespaces: kubectl create namespace test1 || echo "Namespace test1 already exists" kubectl config set-context $$(kubectl config current-context) --namespace=seldon -kind_setup: kind_build_images install_helm install_ambassador install_seldon create_namespaces +kind_setup: install_helm install_ambassador install_seldon create_namespaces port-forward-ambassador: kubectl port-forward $$(kubectl get pods -n seldon -l app.kubernetes.io/name=ambassador -o jsonpath='{.items[0].metadata.name}') -n seldon 8003:8080 diff --git a/testing/scripts/kind_test_setup.sh b/testing/scripts/kind_test_setup.sh index c47952b505..65287ea94f 100755 --- a/testing/scripts/kind_test_setup.sh +++ b/testing/scripts/kind_test_setup.sh @@ -9,4 +9,5 @@ make s2i_build_base_images make kind_create_cluster export KUBECONFIG="$(kind get kubeconfig-path)" +make kind_build_images make kind_setup