Merge pull request #814 from perdasilva/perdasilva/updatee2econfig

OCPBUGS-37559: [release-4.16] Update e2e config and backport list of flakes

Author: openshift-merge-bot[bot]

Makefile

@@ -130,7 +130,15 @@ e2e/operator-registry: ## Run e2e registry tests
 	$(MAKE) e2e WHAT=operator-registry
 
 e2e/olm: ## Run e2e olm tests
-	$(MAKE) e2e WHAT=operator-lifecycle-manager E2E_FLAKE_ATTEMPTS=0 E2E_CATALOG_NS=openshift-marketplace E2E_INSTALL_NS=openshift-operator-lifecycle-manager E2E_TEST_NS=openshift-operators E2E_TIMEOUT=120m KUBECTL=oc E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0"
+	WHAT=operator-lifecycle-manager \
+	E2E_CATALOG_NS=openshift-marketplace \
+	E2E_INSTALL_NS=openshift-operator-lifecycle-manager \
+	E2E_TEST_NS=openshift-operators \
+	E2E_TIMEOUT=135m \
+	KUBECTL=oc \
+	E2E_GINKGO_OPTS="$(if $(ARTIFACT_DIR),--output-dir='$(ARTIFACT_DIR)') --junit-report olm-e2e-junit.xml" \
+	E2E_OPTS="-communityOperators=quay.io/olmtest/test-catalog:v1.39.0" \
+	$(MAKE) e2e
 
 .PHONY: vendor
 vendor: