From 39b8c7e4c21c66f9671c5f2fb017ca6072e4aa6b Mon Sep 17 00:00:00 2001
From: Anand Kumar Singh <anandrkskd@gmail.com>
Date: Mon, 29 Aug 2022 20:56:57 +0530
Subject: [PATCH] fix flake and use operatorhub to install EDB (#6004)

* fix flake

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

* fix flake

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

* check if namespace is created

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

* check if namespace without sercice is created

Signed-off-by: anandrkskd <anandrkskd@gmail.com>

Signed-off-by: anandrkskd <anandrkskd@gmail.com>
---
 .ibm/pipelines/windows-test-script.ps1        |  5 ++--
 .ibm/pipelines/windows-test.sh                |  3 ++-
 Makefile                                      |  2 ++
 .../common/setup-operators.sh                 | 23 ++++++++++++++++++-
 scripts/openshiftci-presubmit-all-tests.sh    |  1 -
 tests/helper/helper_oc.go                     |  2 +-
 .../interactive_add_binding_test.go           |  6 +++--
 7 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/.ibm/pipelines/windows-test-script.ps1 b/.ibm/pipelines/windows-test-script.ps1
index d19b27b18..29f40cd00 100644
--- a/.ibm/pipelines/windows-test-script.ps1
+++ b/.ibm/pipelines/windows-test-script.ps1
@@ -51,8 +51,8 @@ function Run-Test {
 
     $GOCACHE="$(Get-Location)\.gocache" 
     mkdir $GOCACHE
-    [Environment]::SetEnvironmentVariable("GOCACHE", "$GOCACHE")
-
+    [Environment]::SetEnvironmentVariable("GOCACHE", "$GOCACHE")   
+    [Environment]::SetEnvironmentVariable("TEST_EXEC_NODES", "$TEST_EXEC_NODES") 
     [Environment]::SetEnvironmentVariable("SKIP_USER_LOGIN_TESTS","true")
 
     Shout "Login IBMcloud"
@@ -91,6 +91,7 @@ $IBM_OPENSHIFT_ENDPOINT=$args[3]
 $LOGFILE=$args[4]
 $REPO=$args[5]
 $CLUSTER_ID=$args[6]
+$TEST_EXEC_NODES=$args[7]
 Shout "Args Recived"
 
 # Pre test cleanup
diff --git a/.ibm/pipelines/windows-test.sh b/.ibm/pipelines/windows-test.sh
index aaca7a334..497b821e7 100755
--- a/.ibm/pipelines/windows-test.sh
+++ b/.ibm/pipelines/windows-test.sh
@@ -13,7 +13,8 @@ export REPO=${REPO:-"https://github.com/redhat-developer/odo"}
 sshpass -p $WINDOWS_PASSWORD scp -o StrictHostKeyChecking=no ./.ibm/pipelines/windows-test-script.ps1 Administrator@$WINDOWS_IP:/tmp/windows-test-script.ps1
 
 #execute test from the test script
-sshpass -p $WINDOWS_PASSWORD ssh Administrator@$WINDOWS_IP -o StrictHostKeyChecking=no powershell /tmp/windows-test-script.ps1 "${GIT_PR_NUMBER}" "${BUILD_NUMBER}" "${API_KEY_QE}" "${IBM_OPENSHIFT_ENDPOINT}" "${LOGFILE}" "${REPO}" "${WINDOWS_IP}" "${CLUSTER_ID}"
+export TEST_EXEC_NODES=${TEST_EXEC_NODES:-"16"}
+sshpass -p $WINDOWS_PASSWORD ssh Administrator@$WINDOWS_IP -o StrictHostKeyChecking=no powershell /tmp/windows-test-script.ps1 "${GIT_PR_NUMBER}" "${BUILD_NUMBER}" "${API_KEY_QE}" "${IBM_OPENSHIFT_ENDPOINT}" "${LOGFILE}" "${REPO}" "${WINDOWS_IP}" "${CLUSTER_ID}" "${TEST_EXEC_NODES}"
 RESULT=$?
 echo "RESULT: $RESULT"
 
diff --git a/Makefile b/Makefile
index 569ecada9..c624f567b 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/configure-cluster/common/setup-operators.sh b/scripts/configure-cluster/common/setup-operators.sh
index 00259ce77..7e60a92af 100755
--- a/scripts/configure-cluster/common/setup-operators.sh
+++ b/scripts/configure-cluster/common/setup-operators.sh
@@ -1,6 +1,24 @@
 #!/bin/bash
 set -x
 
+install_sourceCatalog(){
+ $1 create -f - <<EOF
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: operatorhubio-catalog
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  image: quay.io/operatorhubio/catalog:latest
+  displayName: Community Operators
+  publisher: OperatorHub.io
+  updateStrategy:
+    registryPoll:
+      interval: 60m
+EOF
+}
+
 install_postgres_operator(){
   $1 create -f - <<EOF
   apiVersion: operators.coreos.com/v1alpha1
@@ -73,8 +91,11 @@ elif [ "$KUBERNETES" == "true" ]; then
   # install "service-binding-operator" using "kubectl" in "operators" namespace; use "operatorhubio-catalog" catalog source from "olm" namespace
   install_service_binding_operator kubectl operators service-binding-operator operatorhubio-catalog olm
 else
+  #install operatorhub.io sourceCatalog 
+  install_sourceCatalog oc
+
   # install "cloud-native-postgresql" using "oc" in "openshift-operators" namespace; use "certified-operators" catalog source from "openshift-marketplace" namespace
-  install_postgres_operator oc openshift-operators certified-operators openshift-marketplace
+  install_postgres_operator oc openshift-operators operatorhubio-catalog openshift-marketplace
 
   # install "rh-service-binding-operator" using "oc" in "openshift-operators" namespace; use "redhat-operators" catalog source from "openshift-marketplace" namespace
   install_service_binding_operator oc openshift-operators rh-service-binding-operator redhat-operators openshift-marketplace
diff --git a/scripts/openshiftci-presubmit-all-tests.sh b/scripts/openshiftci-presubmit-all-tests.sh
index 31a598936..e05d35bd5 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/helper/helper_oc.go b/tests/helper/helper_oc.go
index 9f3329c96..091658c48 100644
--- a/tests/helper/helper_oc.go
+++ b/tests/helper/helper_oc.go
@@ -326,7 +326,7 @@ func (oc OcRunner) CreateAndSetRandNamespaceProjectOfLength(i int) string {
 
 func (oc OcRunner) createAndSetRandNamespaceProject(projectName string) string {
 	fmt.Fprintf(GinkgoWriter, "Creating a new project: %s\n", projectName)
-	session := Cmd("odo", "create", "project", projectName, "-w", "-v4").ShouldPass().Out()
+	session := Cmd(oc.path, "new-project", projectName).ShouldPass().Out()
 	Expect(session).To(ContainSubstring(projectName))
 	oc.addConfigMapForCleanup(projectName)
 	return projectName
diff --git a/tests/integration/interactive_add_binding_test.go b/tests/integration/interactive_add_binding_test.go
index f1ef57556..25bc4f589 100644
--- a/tests/integration/interactive_add_binding_test.go
+++ b/tests/integration/interactive_add_binding_test.go
@@ -228,8 +228,9 @@ var _ = Describe("odo add binding interactive command tests", func() {
 				addBindableKindInOtherNs := commonVar.CliRunner.Run("-n", otherNS, "apply", "-f",
 					helper.GetExamplePath("manifests", "bindablekind-instance.yaml"))
 				Expect(addBindableKindInOtherNs.ExitCode()).To(BeEquivalentTo(0))
-
 				nsWithNoService = commonVar.CliRunner.CreateAndSetRandNamespaceProject()
+				Expect(commonVar.CliRunner.HasNamespaceProject(nsWithNoService)).Should(Equal(true))
+				Expect(commonVar.CliRunner.HasNamespaceProject(otherNS)).Should(Equal(true))
 
 				commonVar.CliRunner.SetProject(commonVar.Project)
 			})
@@ -559,8 +560,9 @@ var _ = Describe("odo add binding interactive command tests", func() {
 				addBindableKindInOtherNs := commonVar.CliRunner.Run("-n", otherNS, "apply", "-f",
 					helper.GetExamplePath("manifests", "bindablekind-instance.yaml"))
 				Expect(addBindableKindInOtherNs.ExitCode()).To(BeEquivalentTo(0))
-
 				nsWithNoService = commonVar.CliRunner.CreateAndSetRandNamespaceProject()
+				Expect(commonVar.CliRunner.HasNamespaceProject(nsWithNoService)).Should(Equal(true))
+				Expect(commonVar.CliRunner.HasNamespaceProject(otherNS)).Should(Equal(true))
 
 				commonVar.CliRunner.SetProject(commonVar.Project)
 			})