Merge pull request #106 from wallrj/fix-bundle-test

Add 5m timeout to bundle-test and make the  computed catalog version stable

Makefile

@@ -16,7 +16,8 @@ export BUNDLE_VERSION ?= 1.13.3
 # For pre-releases use: `candidate`.
 BUNDLE_CHANNELS ?= candidate stable
 STABLE_CHANNEL ?= stable
-CATALOG_VERSION ?= $(shell git describe --tags --always --dirty)
+CATALOG_VERSION_DEFAULT := $(shell git describe --tags --always --dirty)
+CATALOG_VERSION ?= $(CATALOG_VERSION_DEFAULT)
 OPERATORHUB_CATALOG_IMAGE ?= quay.io/operatorhubio/catalog:latest
 
 # from https://suva.sh/posts/well-documented-makefiles/
@@ -238,7 +239,7 @@ kind-cluster: ${kind}
 .PHONY: bundle-test
 bundle-test: ## Build bundles and test locally as described at https://operator-framework.github.io/community-operators/testing-operators/
 bundle-test: $(cmctl) bundle-build bundle-push catalog-build catalog-push kind-cluster deploy-olm catalog-deploy subscription-deploy
-	sed '/install strategy completed/q' < <(kubectl get events --namespace operators --watch)
+	timeout 5m sed '/install strategy completed/q' < <(kubectl get events --namespace operators --watch)
 	$(cmctl) check api --wait=5m -v
 	$(cmctl) version -o yaml