From 93973f01278d21c61d487048c1fec6f47cd4d095 Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@zalando.de>
Date: Fri, 28 Aug 2020 09:44:05 +0200
Subject: [PATCH] do not overwrite local ./manifests during test run

---
 e2e/Makefile | 2 +-
 e2e/run.sh   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/e2e/Makefile b/e2e/Makefile
index 3dbb96eb0..7cbd78a5b 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -47,5 +47,5 @@ tools:
 	# install pinned version of 'kind'
 	GO111MODULE=on go get sigs.k8s.io/kind@v0.5.1
 
-e2etest: tools
+e2etest: tools copy clean
 	./run.sh
diff --git a/e2e/run.sh b/e2e/run.sh
index e8fdfc8ef..9647300c7 100755
--- a/e2e/run.sh
+++ b/e2e/run.sh
@@ -23,7 +23,6 @@ function pull_images(){
 
   e2e_test_image="registry.opensource.zalan.do/acid/postgres-operator-e2e-tests-runner:latest"
   docker pull ${e2e_test_image}
-  #e2e_test_image=$(docker images --filter=reference="registry.opensource.zalan.do/acid/postgres-operator-e2e-tests" --format "{{.Repository}}:{{.Tag}}" | head -1)
 }
 
 function start_kind(){
@@ -52,9 +51,11 @@ function set_kind_api_server_ip(){
 
 function run_tests(){
 
+  # tests modify files in ./manifests, so we mount a copy of this directory done by the e2e Makefile
+
   docker run --rm \
   --mount type=bind,source="$(readlink -f ${kubeconfig_path})",target=/root/.kube/config \
-  --mount type=bind,source="$(readlink -f ../manifests)",target=/manifests \
+  --mount type=bind,source="$(readlink -f manifests)",target=/manifests \
   --mount type=bind,source="$(readlink -f tests)",target=/tests \
   --mount type=bind,source="$(readlink -f exec.sh)",target=/exec.sh \
   -e OPERATOR_IMAGE="${operator_image}" "${e2e_test_image}"