From 4c8c927b85ceae5e5c9d71c9f9cd282da3f31ed8 Mon Sep 17 00:00:00 2001 From: Arvind Thirumurugan Date: Fri, 29 Jul 2022 11:04:49 -0700 Subject: [PATCH 1/3] e2e-tests target fix --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fc460a00c..7e1399a88 100644 --- a/Makefile +++ b/Makefile @@ -156,10 +156,11 @@ build-e2e: go test -c ./test/e2e run-e2e: build-e2e - ./e2e.test -test.v -ginkgo.v + KUBECONFIG=$(KUBECONFIG) HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ./e2e.test -test.v -ginkgo.v .PHONY: e2e-tests -e2e-tests: create-hub-kind-cluster create-member-kind-cluster load-hub-docker-image load-member-docker-image install-member-agent-helm run-e2e +OUTPUT_TYPE=type=docker +e2e-tests: create-hub-kind-cluster create-member-kind-cluster docker-build-hub-agent docker-build-member-agent docker-build-refresh-token load-hub-docker-image load-member-docker-image install-member-agent-helm run-e2e ## reviewable .PHONY: reviewable From 26ba8fe03a06c45339ff7372407943b227035ca9 Mon Sep 17 00:00:00 2001 From: Arvind Thirumurugan Date: Fri, 29 Jul 2022 11:55:41 -0700 Subject: [PATCH 2/3] remove unnecessary targets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7e1399a88..00c2ce48a 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ run-e2e: build-e2e .PHONY: e2e-tests OUTPUT_TYPE=type=docker -e2e-tests: create-hub-kind-cluster create-member-kind-cluster docker-build-hub-agent docker-build-member-agent docker-build-refresh-token load-hub-docker-image load-member-docker-image install-member-agent-helm run-e2e +e2e-tests: create-hub-kind-cluster create-member-kind-cluster load-hub-docker-image load-member-docker-image install-member-agent-helm run-e2e ## reviewable .PHONY: reviewable From d0c57af5c631afeb48703214f64a3fa4fb618eeb Mon Sep 17 00:00:00 2001 From: Arvind Thirumurugan Date: Fri, 29 Jul 2022 11:58:42 -0700 Subject: [PATCH 3/3] Remove var --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 00c2ce48a..a1943f265 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,6 @@ run-e2e: build-e2e KUBECONFIG=$(KUBECONFIG) HUB_SERVER_URL="https://$$(docker inspect $(HUB_KIND_CLUSTER_NAME)-control-plane --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'):6443" ./e2e.test -test.v -ginkgo.v .PHONY: e2e-tests -OUTPUT_TYPE=type=docker e2e-tests: create-hub-kind-cluster create-member-kind-cluster load-hub-docker-image load-member-docker-image install-member-agent-helm run-e2e ## reviewable