Reorganized test file directory structure (#5537)

* Rebased was required

* Replicated changes to  openshiftci related scripts to avoid test failure

.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}"

.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

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

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
 

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