From 73ec869386ccd17d91b92528a89b372de9bc92d8 Mon Sep 17 00:00:00 2001 From: Granville Schmidt <1246157+gramidt@users.noreply.github.com> Date: Fri, 22 Jan 2021 16:49:01 -0700 Subject: [PATCH 1/3] fixed testing image from being used in non-test artifacts Signed-off-by: Granville Schmidt <1246157+gramidt@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9ecf371437..81d6351f99 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ prepare-e2e: kuttl set-test-image-vars set-image-controller container $(KUSTOMIZE) build config/crd -o tests/_build/crds/ set-test-image-vars: -IMG=local/opentelemetry-operator:e2e + IMG=local/opentelemetry-operator:e2e # Build the container image, used only for local dev purposes container: From 946e313f17e8c66cfcdd95c3fd4c36636c8ca384 Mon Sep 17 00:00:00 2001 From: Granville Schmidt <1246157+gramidt@users.noreply.github.com> Date: Fri, 22 Jan 2021 17:29:03 -0700 Subject: [PATCH 2/3] resovled issue with image not being set to test image globally Signed-off-by: Granville Schmidt <1246157+gramidt@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81d6351f99..9af4b85f5b 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ prepare-e2e: kuttl set-test-image-vars set-image-controller container $(KUSTOMIZE) build config/crd -o tests/_build/crds/ set-test-image-vars: - IMG=local/opentelemetry-operator:e2e + $(eval IMG=local/opentelemetry-operator:e2e) # Build the container image, used only for local dev purposes container: From d577f4d66a4c3289b541f4fc34365c3c63a85a4d Mon Sep 17 00:00:00 2001 From: Granville Schmidt <1246157+gramidt@users.noreply.github.com> Date: Fri, 22 Jan 2021 17:48:17 -0700 Subject: [PATCH 3/3] requeue and verify tests Signed-off-by: Granville Schmidt <1246157+gramidt@users.noreply.github.com>