Merge pull request #1060 from intel/olm-skew-fix

e2e: fix OLM version skew testing

Author: pohly

test/e2e/deploy/deploy.go

@@ -1246,7 +1246,7 @@ func EnsureDeploymentNow(f *framework.Framework, deployment *Deployment) {
 		// generated oln-bundles under /deploy in the source tree.
 		if deployment.HasOLM {
 			make := exec.Command("make", "operator-generate-bundle", "VERSION="+tag, "REPO_ROOT="+workRoot)
-			make.Dir = root
+			make.Dir = workRoot
 			make.Env = env
 			_, err := pmemexec.Run(ctx, make)
 			framework.ExpectNoError(err, "%s: generate bundle for operator version %s", deployment.Name(), deployment.Version)

test/start-stop-olm.sh

@@ -85,6 +85,7 @@ if [ $cmd == install ]; then
             # checks for.
             ${BIN_DIR}/operator-sdk olm uninstall
             ${KUBECTL} delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_VERSION}/olm.yaml
+            ${KUBECTL} delete -f https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_VERSION}/crds.yaml
             ${KUBECTL} delete ns olm
         fi
     done