Define label for integration tests not needing cluster (#6242)

.ibm/pipelines/kubernetes-tests.sh

@@ -15,7 +15,7 @@ export SKIP_USER_LOGIN_TESTS=true
     export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' || true)"
     echo Using Devfile proxy: ${DEVFILE_PROXY}
     make install
-    make test-integration
+    make test-integration-cluster
     make test-e2e
 ) |& tee "/tmp/${LOGFILE}"
 

.ibm/pipelines/nocluster-tests.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+LOGFILE="pr-${GIT_PR_NUMBER}-nocluster-tests-${BUILD_NUMBER}"
+
+source .ibm/pipelines/functions.sh
+
+ibmcloud login --apikey "${API_KEY_QE}"
+ibmcloud target -r "${IBM_REGION}"
+
+(
+    set -e
+    make install
+    make test-integration-no-cluster
+) |& tee "/tmp/${LOGFILE}"
+
+RESULT=${PIPESTATUS[0]}
+
+save_logs "${LOGFILE}" "NoCluster Tests" ${RESULT}
+
+exit ${RESULT}

.ibm/pipelines/openshift-tests.sh

@@ -16,7 +16,7 @@ cleanup_namespaces
     export DEVFILE_PROXY="$(kubectl get svc -n devfile-proxy nginx -o jsonpath='{.status.loadBalancer.ingress[0].hostname}' || true)"
     echo Using Devfile proxy: ${DEVFILE_PROXY}
     make install
-    make test-integration
+    make test-integration-cluster
     make test-e2e
 ) |& tee "/tmp/${LOGFILE}"
 

.ibm/pipelines/windows-test-script.ps1

@@ -80,7 +80,7 @@ function Run-Test {
     Shout "Create Binary"
     make install 
     Shout "Running test"
-    make test-integration           | tee -a  C:\Users\Administrator.ANSIBLE-TEST-VS\AppData\Local\Temp\$LOGFILE
+    make test-integration-cluster           | tee -a  C:\Users\Administrator.ANSIBLE-TEST-VS\AppData\Local\Temp\$LOGFILE
     Check-ExitCode $LASTEXITCODE
     make test-e2e           | tee -a  C:\Users\Administrator.ANSIBLE-TEST-VS\AppData\Local\Temp\$LOGFILE
     Check-ExitCode $LASTEXITCODE

Makefile

@@ -49,8 +49,8 @@ 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.
+# Flags to run one test per core.
-GINKGO_FLAGS_SERIAL = $(GINKGO_FLAGS_ALL) -nodes=1
+GINKGO_FLAGS_AUTO = $(GINKGO_FLAGS_ALL) -p
 # Flags for tests that may be run in parallel
 GINKGO_FLAGS=$(GINKGO_FLAGS_ALL) -nodes=$(TEST_EXEC_NODES)
 # GolangCi version for unit-validate test
@@ -188,9 +188,16 @@ vendor-update: ## Update vendoring
 openshiftci-presubmit-unittests:
 	./scripts/openshiftci-presubmit-unittests.sh
 
+.PHONY: test-integration-cluster
+test-integration-cluster:
+	$(RUN_GINKGO) $(GINKGO_FLAGS) --label-filter="!nocluster" tests/integration
+
+.PHONY: test-integration-no-cluster
+test-integration-no-cluster:
+	$(RUN_GINKGO) $(GINKGO_FLAGS_AUTO) --label-filter=nocluster tests/integration
+
 .PHONY: test-integration
-test-integration:
+test-integration: test-integration-no-cluster test-integration-cluster
-	$(RUN_GINKGO) $(GINKGO_FLAGS) tests/integration
 
 .PHONY: test-e2e
 test-e2e:

tests/helper/helper_generic.go

@@ -193,10 +193,10 @@ func CommonBeforeEach(setupCluster bool) CommonVar {
 	commonVar := CommonVar{}
 	commonVar.Context = CreateNewContext()
 	commonVar.ConfigDir = CreateNewContext()
-	commonVar.OriginalKubeconfig = os.Getenv("KUBECONFIG")
 	commonVar.CliRunner = GetCliRunner()
-	LocalKubeconfigSet(commonVar.ConfigDir)
+	commonVar.OriginalKubeconfig = os.Getenv("KUBECONFIG")
 	if setupCluster {
+		LocalKubeconfigSet(commonVar.ConfigDir)
 		commonVar.Project = commonVar.CliRunner.CreateAndSetRandNamespaceProject()
 	}
 	commonVar.OriginalWorkingDirectory = Getwd()

tests/helper/labels.go

@@ -0,0 +1,5 @@
+package helper
+
+const (
+	LabelNoCluster = "nocluster"
+)

tests/integration/cmd_analyze_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/redhat-developer/odo/tests/helper"
 )
 
-var _ = Describe("odo analyze command tests", func() {
+var _ = Describe("odo analyze command tests", Label(helper.LabelNoCluster), func() {
 	var commonVar helper.CommonVar
 
 	// This is run before every Spec (It)

tests/integration/cmd_devfile_init_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/redhat-developer/odo/tests/helper"
 )
 
-var _ = Describe("odo devfile init command tests", func() {
+var _ = Describe("odo devfile init command tests", Label(helper.LabelNoCluster), func() {
 
 	var commonVar helper.CommonVar
 

tests/integration/cmd_devfile_registry_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/redhat-developer/odo/tests/helper"
 )
 
-var _ = Describe("odo devfile registry command tests", func() {
+var _ = Describe("odo devfile registry command tests", Label(helper.LabelNoCluster), func() {
 	const registryName string = "RegistryName"
 
 	// Use staging OCI-based registry for tests to avoid overload

tests/integration/cmd_pref_config_test.go

@@ -13,7 +13,7 @@ import (
 
 const promptMessageSubString = "Help odo improve by allowing it to collect usage data."
 
-var _ = Describe("odo preference and config command tests", func() {
+var _ = Describe("odo preference and config command tests", Label(helper.LabelNoCluster), func() {
 	// TODO: A neater way to provide odo path. Currently we assume odo and oc in $PATH already.
 	var commonVar helper.CommonVar
 

tests/integration/interactive_init_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/redhat-developer/odo/tests/helper"
 )
 
-var _ = Describe("odo init interactive command tests", func() {
+var _ = Describe("odo init interactive command tests", Label(helper.LabelNoCluster), func() {
 
 	var commonVar helper.CommonVar