From bfe2ec6995c99b129cfe5c696061de896631b691 Mon Sep 17 00:00:00 2001 From: Aleksey Dukhovniy Date: Mon, 21 Oct 2019 18:26:04 +0200 Subject: [PATCH 1/3] Fix e2e-tests by running them against the `dev` branch of the operators repo which is held compatible with KUDOs bleeding edge development including breaking API changes etc. --- hack/run-e2e-tests.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/run-e2e-tests.sh b/hack/run-e2e-tests.sh index 8cc0a3319..bdd9097ea 100755 --- a/hack/run-e2e-tests.sh +++ b/hack/run-e2e-tests.sh @@ -16,6 +16,8 @@ then rm -rf operators git clone https://github.com/kudobuilder/operators + # KUDO e2e tests are executed against operators dev branch, which is held compatible with KUDOs bleeding edge + git checkout ad/tasker mkdir operators/bin/ cp ./bin/kubectl-kudo operators/bin/ cd operators && go run ../cmd/kubectl-kudo test 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > ../reports/kudo_operators_test_report.xml From fc8fcb2e0a1f78df3244d1b663a1758b1aeefe94 Mon Sep 17 00:00:00 2001 From: Alena Varkockova Date: Mon, 21 Oct 2019 20:42:46 +0200 Subject: [PATCH 2/3] Clone with branch name --- hack/run-e2e-tests.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hack/run-e2e-tests.sh b/hack/run-e2e-tests.sh index bdd9097ea..90700f66c 100755 --- a/hack/run-e2e-tests.sh +++ b/hack/run-e2e-tests.sh @@ -15,9 +15,8 @@ then go run ./cmd/kubectl-kudo test --config kudo-e2e-test.yaml 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > reports/kudo_e2e_test_report.xml rm -rf operators - git clone https://github.com/kudobuilder/operators # KUDO e2e tests are executed against operators dev branch, which is held compatible with KUDOs bleeding edge - git checkout ad/tasker + git clone --branch ad/tasker https://github.com/kudobuilder/operators mkdir operators/bin/ cp ./bin/kubectl-kudo operators/bin/ cd operators && go run ../cmd/kubectl-kudo test 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > ../reports/kudo_operators_test_report.xml @@ -27,7 +26,7 @@ else go run ./cmd/kubectl-kudo test --config kudo-e2e-test.yaml rm -rf operators - git clone https://github.com/kudobuilder/operators + git clone --branch ad/tasker https://github.com/kudobuilder/operators mkdir operators/bin/ cp ./bin/kubectl-kudo operators/bin/ cd operators && go run ../cmd/kubectl-kudo test From 320e6d61ace14b16b0db52a41d35a70f88d0b97b Mon Sep 17 00:00:00 2001 From: Aleksey Dukhovniy Date: Tue, 22 Oct 2019 18:24:44 +0200 Subject: [PATCH 3/3] Using proper `dev` branch --- hack/run-e2e-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/run-e2e-tests.sh b/hack/run-e2e-tests.sh index 90700f66c..b4b084915 100755 --- a/hack/run-e2e-tests.sh +++ b/hack/run-e2e-tests.sh @@ -16,7 +16,7 @@ then rm -rf operators # KUDO e2e tests are executed against operators dev branch, which is held compatible with KUDOs bleeding edge - git clone --branch ad/tasker https://github.com/kudobuilder/operators + git clone --branch dev https://github.com/kudobuilder/operators mkdir operators/bin/ cp ./bin/kubectl-kudo operators/bin/ cd operators && go run ../cmd/kubectl-kudo test 2>&1 |tee /dev/fd/2 |go-junit-report -set-exit-code > ../reports/kudo_operators_test_report.xml @@ -26,7 +26,7 @@ else go run ./cmd/kubectl-kudo test --config kudo-e2e-test.yaml rm -rf operators - git clone --branch ad/tasker https://github.com/kudobuilder/operators + git clone --branch dev https://github.com/kudobuilder/operators mkdir operators/bin/ cp ./bin/kubectl-kudo operators/bin/ cd operators && go run ../cmd/kubectl-kudo test