Add scripts for e2e test on psi

scripts/openshiftci-e2e-4x-psi-tests_win_mac.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+case $1 in
+
+  win)
+    export SENDQUEUE=amqp.ci.queue.win.e2e.send
+    export SENDTOPIC=amqp.ci.topic.win.e2e.send
+    export JOB_NAME=odo-windows-e2e-pr-build
+    export SENDEXCHANGE=amqp.ci.exchange.win.e2e.send
+    ;;
+
+  mac)
+    export SENDQUEUE=amqp.ci.queue.mac.e2e.send
+    export SENDTOPIC=amqp.ci.topic.mac.e2e.send
+    export JOB_NAME=odo-mac-e2e-pr-build
+    export SENDEXCHANGE=amqp.ci.exchange.mac.e2e.send
+    ;;
+esac
+
+. scripts/openshiftci-e2e-4x-psi-tests.sh

scripts/run_script_e2e.sh

@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+
+shout() {
+  set +x
+  echo -e "\n!!!!!!!!!!!!!!!!!!!!\n${1}\n!!!!!!!!!!!!!!!!!!!!\n"
+  set -x
+}
+
+# Prep for integration/e2e
+shout "Building odo binaries"
+make bin
+
+# copy built odo to GOBIN
+cp -avf ./odo $GOBIN_TEMP/
+shout "getting ginkgo"
+make goget-ginkgo
+
+# Integration tests
+shout "Testing against 4x cluster"
+
+shout "Logging into 4x cluster for some setup (logs hidden)"
+set +x
+oc login -u kubeadmin -p ${OCP4X_KUBEADMIN_PASSWORD} --insecure-skip-tls-verify  ${OCP4X_API_URL}
+set -x
+
+shout "Doing some presetup"
+
+# Delete any projects with SCRIPT_IDENTITY PREFIX. This is GC from previous runs which fail before end of script cleanup
+for i in $(oc projects -q); do
+    if [[ $i == "${SCRIPT_IDENTITY}"* ]]; then
+        oc delete project $i
+    fi
+done
+
+# Generate random project names to some tests
+export REDHAT_OPENJDK11_RHEL8_PROJECT="${SCRIPT_IDENTITY}$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 4 | head -n 1)"
+export REDHAT_OPENJDK11_UBI8_PROJECT="${SCRIPT_IDENTITY}$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 4 | head -n 1)"
+export REDHAT_NODEJS12_RHEL7_PROJECT="${SCRIPT_IDENTITY}$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 4 | head -n 1)"
+export REDHAT_NODEJS12_UBI8_PROJECT="${SCRIPT_IDENTITY}$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 4 | head -n 1)"
+export REDHAT_NODEJS14_UBI8_PROJECT="${SCRIPT_IDENTITY}$(cat /dev/urandom | tr -dc 'a-z0-9' | fold -w 4 | head -n 1)"
+
+# Create the namespace for e2e image test apply pull secret to the namespace
+for i in `echo "$REDHAT_OPENJDK11_RHEL8_PROJECT $REDHAT_NODEJS12_RHEL7_PROJECT $REDHAT_NODEJS12_UBI8_PROJECT $REDHAT_OPENJDK11_UBI8_PROJECT $REDHAT_NODEJS14_UBI8_PROJECT"`; do
+    # create the namespace
+    oc new-project $i
+    # Applying pull secret to the namespace which will be used for pulling images from authenticated registry
+    oc get secret pull-secret -n openshift-config -o yaml | sed "s/openshift-config/$i/g" | oc apply -f -
+    # Let developer user have access to the project
+    oc adm policy add-role-to-user edit developer
+done
+
+shout "Logging into 4x cluster as developer (logs hidden)"
+set +x
+oc login -u developer -p ${OCP4X_DEVELOPER_PASSWORD} --insecure-skip-tls-verify ${OCP4X_API_URL}
+set -x
+
+# # Integration tests
+#shout "Running integration Tests"
+make test-operator-hub || error=true
+#remove comments from test-integration & test-integration-devfile once #4606 https://github.com/openshift/odo/issues/4606 is resolved 
+#make test-integration || error=true
+#make test-integration-devfile || error=true 
+make test-cmd-devfile-catalog || error=true
+make test-cmd-devfile-exec || error=true
+make test-cmd-devfile-registry || error=true
+make test-cmd-login-logout || error=true
+make test-cmd-project || error=true
+
+
+# E2e tests
+shout "Running e2e tests"
+make test-e2e-all || error=true
+# Fail the build if there is any error while test execution
+if [ $error ]; then 
+    exit -1
+fi
+
+shout "cleaning up post tests"
+shout "Logging into 4x cluster for cleanup (logs hidden)"
+set +x
+oc login -u kubeadmin -p ${OCP4X_KUBEADMIN_PASSWORD} --insecure-skip-tls-verify ${OCP4X_API_URL}
+set -x
+
+shout "Cleaning up some leftover projects"
+
+set +x
+for i in $(oc projects -q); do
+    if [[ $i == "${SCRIPT_IDENTITY}"* ]]; then
+        oc delete project $i
+    fi
+done
+set -x

scripts/setup_script_e2e.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+shout() {
+  set +x
+  echo -e "\n!!!!!!!!!!!!!!!!!!!!\n${1}\n!!!!!!!!!!!!!!!!!!!!\n"
+  set -x
+}
+
+set -ex
+
+shout "Setting up some stuff"
+
+# Create a bin directory whereever script runs. This will be where all binaries that need to be in PATH will reside.
+mkdir bin artifacts
+# Change the default location of go's bin directory (without affecting GOPATH). This is where compiled binaries will end up by default
+# for eg go get ginkgo later on will produce ginkgo binary in GOBIN
+export GOBIN="`pwd`/bin"
+export GOBIN_TEMP=$GOBIN
+# Set kubeconfig to current dir. This ensures no clashes with other test runs
+export KUBECONFIG="`pwd`/config"
+export ARTIFACT_DIR=${ARTIFACT_DIR:-"`pwd`/artifacts"}
+export CUSTOM_HOMEDIR=$ARTIFACT_DIR
+export WORKDIR=${WORKDIR:-"`pwd`"}
+export GOCACHE=`pwd`/.gocache && mkdir $GOCACHE
+
+# This si one of the variables injected by ci-firewall. Its purpose is to allow scripts to handle uniqueness as needed
+SCRIPT_IDENTITY=${SCRIPT_IDENTITY:-"def-id"}
+export SKIP_USER_LOGIN_TESTS="true"
+
+shout "Getting oc binary"
+if [[ $BASE_OS == "linux"  ]]; then
+    set +x
+    curl --connect-timeout 150 --max-time 2048 -k ${OCP4X_DOWNLOAD_URL}/${ARCH}/${BASE_OS}/oc.tar -o ./oc.tar
+    set -x
+    tar -C $GOBIN -xvf ./oc.tar && rm -rf ./oc.tar
+else
+    set +x
+    curl --connect-timeout 210 --max-time 2048 -k ${OCP4X_DOWNLOAD_URL}/${ARCH}/${BASE_OS}/oc.zip -o ./oc.zip
+    set -x
+    if [[ $BASE_OS == "windows" ]]; then
+        GOBIN_TEMP=$GOBIN
+        GOBIN="$(cygpath -pw $GOBIN)"
+        CURRDIR="$(cygpath -pw $WORKDIR)"
+        GOCACHE="$(cygpath -pw $GOCACHE)"
+        powershell -Command "Expand-Archive -Path $CURRDIR\oc.zip  -DestinationPath $GOBIN"
+        chmod +x $GOBIN_TEMP/*
+    fi
+    if [[ $BASE_OS == "mac" ]]; then
+        # Skiping download of oc binary for test due to bandwidth issue, binary from cluster is stored in ~/ocforodo dir in macmini 
+        #unzip ./oc.zip -d ~/go/bin/ && chmod +x ~/go/bin/oc
+        unzip ./oc.zip -d $GOBIN && rm -rf ./oc.zip && chmod +x $GOBIN/oc
+        PATH="$PATH:/usr/local/bin:/usr/local/go/bin"
+    fi
+fi
+
+# Add GOBIN which is the bin dir we created earlier to PATH so any binaries there are automatically available in PATH
+export PATH=$PATH:$GOBIN
+
+#-----------------------------------------------------------------------------

tests/helper/helper_generic.go

@@ -307,6 +307,7 @@ func CommonBeforeEach() CommonVar {
 
 // CommonAfterEach is common function that cleans up after every test Spec (It)
 func CommonAfterEach(commonVar CommonVar) {
+	CmdRunner("oc", "describe", "pods", "-n", commonVar.Project)
 	// delete the random project/namespace created in CommonBeforeEach
 	commonVar.CliRunner.DeleteNamespaceProject(commonVar.Project)
 

tests/integration/cmd_push_test.go

@@ -118,7 +118,8 @@ var _ = Describe("odo push command tests", func() {
 			// create a file and folder then push
 			err := os.MkdirAll(filepath.Join(commonVar.Context, "tests"), 0750)
 			Expect(err).To(BeNil())
-			_, err = os.Create(filepath.Join(commonVar.Context, "README.md"))
+			testFile, err := os.Create(filepath.Join(commonVar.Context, "README.md"))
+			testFile.Close()
 			Expect(err).To(BeNil())
 
 			helper.CmdShouldPass("odo", "push", "--context", commonVar.Context)

tests/integration/component.go

@@ -255,8 +255,13 @@ func componentTests(args ...string) {
 			oc.ImportJavaIS(commonVar.Project)
 			helper.CopyExample(filepath.Join("binary", "java", "openjdk"), commonVar.Context)
 			// Was failing due to https://github.com/openshift/odo/issues/1969
-			helper.CmdShouldPass("odo", append(args, "create", "--s2i", "java:8", "sb-jar-test", "--project",
-				commonVar.Project, "--binary", filepath.Join(commonVar.Context, "sb.jar"))...)
+			if runtime.GOOS == "darwin" {
+				helper.CmdShouldPass("odo", append(args, "create", "--s2i", "java:8", "sb-jar-test", "--project",
+					commonVar.Project, "--binary", filepath.Join("/private", commonVar.Context, "sb.jar"))...)
+			} else {
+				helper.CmdShouldPass("odo", append(args, "create", "--s2i", "java:8", "sb-jar-test", "--project",
+					commonVar.Project, "--binary", filepath.Join(commonVar.Context, "sb.jar"))...)
+			}
 			info := helper.LocalEnvInfo(commonVar.Context)
 			Expect(info.GetName(), "sb-jar-test")
 		})

tests/integration/devfile/cmd_devfile_create_test.go

@@ -79,7 +79,7 @@ var _ = Describe("odo devfile create command tests", func() {
 	Context("When executing odo create with devfile component type argument and --context flag", func() {
 		var newContext, envFilePath string
 		JustBeforeEach(func() {
-			newContext = path.Join(commonVar.Context, "newContext")
+			newContext = filepath.Join(commonVar.Context, "newContext")
 			devfilePath = filepath.Join(newContext, devfile)
 			helper.MakeDir(newContext)
 		})
@@ -157,6 +157,7 @@ var _ = Describe("odo devfile create command tests", func() {
 			values := gjson.GetMany(output, "kind", "metadata.name", "status.state")
 			Expect(helper.GjsonMatcher(values, []string{"Component", "nodejs", "Unknown"})).To(Equal(true))
 
+			newKubeConfig.Close()
 			err = os.Remove(newKubeConfigPath)
 			Expect(err).To(BeNil())
 		})