test(e2e): reuse images (#4803)

Signed-off-by: Jakub Dyszkiewicz <[email protected]>
kumahq · Aug 11, 2022 · 308f420 · 308f420
1 parent 2666731
commit 308f420
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -346,7 +346,7 @@ jobs:
               export E2E_PKG_LIST=${E2E_PKG_LIST:-$(circleci tests glob ./test/e2e/* | circleci tests split | xargs printf "./%s/... ")}
             fi
             env
-            make ${MAKE_PARAMETERS} << parameters.target >>
+            make ${MAKE_PARAMETERS} CI=true << parameters.target >>
       - store_test_results:
           path: build/reports
 

diff --git a/mk/docker.mk b/mk/docker.mk
@@ -75,7 +75,7 @@ ${BUILD_DOCKER_IMAGES_DIR}:
 docker/save: $(DOCKER_SAVE_TARGETS)
 
 .PHONY: docker/save/release
-docker/save/release: docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-init docker/save/kuma-prometheus-sd
+docker/save/release: docker/save/kuma-cp docker/save/kuma-dp docker/save/kumactl docker/save/kuma-init docker/save/kuma-prometheus-sd docker/save/kuma-cni
 
 .PHONY: docker/save/test
 docker/save/test: docker/save/kuma-universal
@@ -100,6 +100,10 @@ docker/save/kuma-init: ${BUILD_DOCKER_IMAGES_DIR}
 docker/save/kuma-prometheus-sd: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-prometheus-sd.tar $(KUMA_PROMETHEUS_SD_DOCKER_IMAGE)
 
+.PHONY: docker/save/kuma-cni
+docker/save/kuma-cni: ${BUILD_DOCKER_IMAGES_DIR}
+	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-cni.tar $(KUMA_CNI_DOCKER_IMAGE)
+
 .PHONY: docker/save/kuma-universal
 docker/save/kuma-universal: ${BUILD_DOCKER_IMAGES_DIR}
 	docker save --output ${BUILD_DOCKER_IMAGES_DIR}/kuma-universal.tar $(KUMA_UNIVERSAL_DOCKER_IMAGE)
@@ -108,7 +112,7 @@ docker/save/kuma-universal: ${BUILD_DOCKER_IMAGES_DIR}
 docker/load: $(DOCKER_LOAD_TARGETS)
 
 .PHONY: docker/load/release
-docker/load/release: docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-init docker/load/kuma-prometheus-sd
+docker/load/release: docker/load/kuma-cp docker/load/kuma-dp docker/load/kumactl docker/load/kuma-init docker/load/kuma-prometheus-sd docker/load/kuma-cni
 
 .PHONY: docker/load/test
 docker/load/test: docker/load/kuma-universal
@@ -133,6 +137,10 @@ docker/load/kuma-init: ${BUILD_DOCKER_IMAGES_DIR}/kuma-init.tar
 docker/load/kuma-prometheus-sd: ${BUILD_DOCKER_IMAGES_DIR}/kuma-prometheus-sd.tar
 	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-prometheus-sd.tar
 
+.PHONY: docker/load/kuma-cni
+docker/load/kuma-cni: ${BUILD_DOCKER_IMAGES_DIR}/kuma-cni.tar
+	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-cni.tar
+
 .PHONY: docker/load/kuma-universal
 docker/load/kuma-universal: ${BUILD_DOCKER_IMAGES_DIR}/kuma-universal.tar
 	docker load --input ${BUILD_DOCKER_IMAGES_DIR}/kuma-universal.tar

diff --git a/mk/e2e.new.mk b/mk/e2e.new.mk
@@ -64,7 +64,7 @@ test/e2e/k8s/start/cluster/$1:
 
 .PHONY: test/e2e/k8s/load/images/$1
 test/e2e/k8s/load/images/$1:
-	KIND_CLUSTER_NAME=$1 $(MAKE) $(K8S_CLUSTER_TOOL)/load
+	KIND_CLUSTER_NAME=$1 $(MAKE) $(K8S_CLUSTER_TOOL)/load/images
 
 .PHONY: test/e2e/k8s/wait/$1
 test/e2e/k8s/wait/$1: