Reorganized test file directory structure (redhat-developer#5537)

* Rebased was required * Replicated changes to openshiftci related scripts to avoid test failure
rm3l · Mar 16, 2022 · 83f26da · 83f26da
1 parent 070b877
commit 83f26da
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 7 deletions.
diff --git a/.ibm/pipelines/kubernetes-tests.sh b/.ibm/pipelines/kubernetes-tests.sh
@@ -14,7 +14,7 @@ cleanup_namespaces
     set -e
     make install
     make test-integration-devfile
-    make test-integration-interactive
+    make test-interactive
     make test-e2e-devfile
     make test-cmd-project
 ) |& tee "/tmp/${LOGFILE}"

diff --git a/.ibm/pipelines/openshift-tests.sh b/.ibm/pipelines/openshift-tests.sh
@@ -15,7 +15,7 @@ cleanup_namespaces
     set -e
     make install
     make test-integration
-    make test-integration-interactive
+    make test-interactive
     make test-integration-devfile
     make test-cmd-login-logout
     make test-cmd-project

diff --git a/Makefile b/Makefile
@@ -266,9 +266,9 @@ test-cmd-debug: install ## Run odo debug command tests
 test-integration: install ## Run command's integration tests irrespective of service catalog status in the cluster.
 	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/integration/
 
-.PHONY: test-interactive test
-test-integration-interactive: install ## Run integration interactive tests
-	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/integration/interactive/
+.PHONY: test-interactive
+test-interactive: install ## Run integration interactive tests
+	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/interactive/
 
 .PHONY: test-integration-devfile
 test-integration-devfile: install ## Run devfile integration tests

diff --git a/scripts/openshiftci-periodic-tests.sh b/scripts/openshiftci-periodic-tests.sh
@@ -29,10 +29,12 @@ oc whoami
 # Integration tests
 make test-integration || error=true
 make test-integration-devfile || error=true
-make test-integration-interactive || error=true
 make test-cmd-login-logout || error=true
 make test-cmd-project || error=true
 
+# Interactive tests
+make test-interactive || error=true
+
 # E2e tests
 make test-e2e-all || error=true
 

diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh
@@ -52,11 +52,14 @@ elif  [ "${ARCH}" == "ppc64le" ]; then
 else
     # Integration tests
     make test-integration || error=true
-    make test-integration-interactive || error=true
+    make test-interactive || error=true
     make test-integration-devfile || error=true
     make test-cmd-login-logout || error=true
     make test-cmd-project || error=true
 
+    # Interactive tests
+   make test-interactive || error=true
+
     # E2e tests
     make test-e2e-all || error=true
 

diff --git a/...ntegration/interactive/cmd_deploy_test.go → tests/interactive/cmd_deploy_test.go b/...ntegration/interactive/cmd_deploy_test.go → tests/interactive/cmd_deploy_test.go
diff --git a/...s/integration/interactive/cmd_dev_test.go → tests/interactive/cmd_dev_test.go b/...s/integration/interactive/cmd_dev_test.go → tests/interactive/cmd_dev_test.go
diff --git a/.../integration/interactive/cmd_init_test.go → tests/interactive/cmd_init_test.go b/.../integration/interactive/cmd_init_test.go → tests/interactive/cmd_init_test.go
diff --git a/...tion/interactive/interactive_suit_test.go → tests/interactive/interactive_suit_test.go b/...tion/interactive/interactive_suit_test.go → tests/interactive/interactive_suit_test.go