From 262bff9e34812d9e3810d9fdf836799c65bd47e1 Mon Sep 17 00:00:00 2001 From: anandrkskd Date: Thu, 4 Aug 2022 11:22:21 +0530 Subject: [PATCH] fix flake Signed-off-by: anandrkskd --- Makefile | 2 ++ scripts/openshiftci-presubmit-all-tests.sh | 1 - tests/integration/interactive_add_binding_test.go | 6 ++---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 569ecada9d9..c624f567bbb 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,8 @@ export ODO_LOG_LEVEL ?= 4 # To enable verbosity export or set env GINKGO_TEST_ARGS like "GINKGO_TEST_ARGS=-v" UNIT_TEST_ARGS ?= +export ARTIFACT_DIR ?= . + GINKGO_FLAGS_ALL = $(GINKGO_TEST_ARGS) --randomize-all --slow-spec-threshold=$(SLOW_SPEC_THRESHOLD) -timeout $(TIMEOUT) --no-color # Flags for tests that must not be run in parallel. diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh index 31a59893669..e05d35bd544 100755 --- a/scripts/openshiftci-presubmit-all-tests.sh +++ b/scripts/openshiftci-presubmit-all-tests.sh @@ -55,5 +55,4 @@ else fi fi - oc logout diff --git a/tests/integration/interactive_add_binding_test.go b/tests/integration/interactive_add_binding_test.go index f1ef5755603..d0010903e0e 100644 --- a/tests/integration/interactive_add_binding_test.go +++ b/tests/integration/interactive_add_binding_test.go @@ -224,13 +224,12 @@ var _ = Describe("odo add binding interactive command tests", func() { var nsWithNoService string BeforeEach(func() { + nsWithNoService = commonVar.Project otherNS = commonVar.CliRunner.CreateAndSetRandNamespaceProject() addBindableKindInOtherNs := commonVar.CliRunner.Run("-n", otherNS, "apply", "-f", helper.GetExamplePath("manifests", "bindablekind-instance.yaml")) Expect(addBindableKindInOtherNs.ExitCode()).To(BeEquivalentTo(0)) - nsWithNoService = commonVar.CliRunner.CreateAndSetRandNamespaceProject() - commonVar.CliRunner.SetProject(commonVar.Project) }) @@ -555,13 +554,12 @@ var _ = Describe("odo add binding interactive command tests", func() { var nsWithNoService string BeforeEach(func() { + nsWithNoService = commonVar.Project otherNS = commonVar.CliRunner.CreateAndSetRandNamespaceProject() addBindableKindInOtherNs := commonVar.CliRunner.Run("-n", otherNS, "apply", "-f", helper.GetExamplePath("manifests", "bindablekind-instance.yaml")) Expect(addBindableKindInOtherNs.ExitCode()).To(BeEquivalentTo(0)) - nsWithNoService = commonVar.CliRunner.CreateAndSetRandNamespaceProject() - commonVar.CliRunner.SetProject(commonVar.Project) })