revert local changes

Author: jeyaramashok

Makefile

@@ -87,15 +87,15 @@ build-coverage: build_cmd=test -c -covermode=count -coverpkg ./pkg/controller/..
 build-coverage: clean $(CMDS)
 
 build-linux: build_cmd=build
-build-linux: arch_flags=GOOS=linux GOARCH=amd64
+build-linux: arch_flags=GOOS=linux GOARCH=386
 build-linux: clean $(CMDS)
 
 build-wait: clean bin/wait
 
 bin/wait: FORCE
-	GOOS=linux GOARCH=amd64 go build $(MOD_FLAGS) -o $@ $(PKG)/test/e2e/wait
+	GOOS=linux GOARCH=386 go build $(MOD_FLAGS) -o $@ $(PKG)/test/e2e/wait
 
-build-util-linux: arch_flags=GOOS=linux GOARCH=amd64
+build-util-linux: arch_flags=GOOS=linux GOARCH=386
 build-util-linux: build-util
 
 build-util: bin/cpb
@@ -140,7 +140,7 @@ FORCE:
 # main entry point for running end to end tests. used by .github/workflows/e2e-tests.yml See test/e2e/README.md for details
 .PHONY: e2e-local
 e2e-local: bin/e2e-local.test test/e2e-local.image.tar
-	$(GINKGO) -nodes $(or $(NODES),1) -flakeAttempts 1 -randomizeAllSpecs $(if $(TEST),-focus '$(TEST)') -v -timeout 90m $< -- -namespace=operators -olmNamespace=operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -kind.images=../test/e2e-local.image.tar -toolsBin=$(TOOLS_BIN)
+	$(GINKGO) -nodes $(or $(NODES),1) -flakeAttempts 3 -randomizeAllSpecs $(if $(TEST),-focus '$(TEST)') -v -timeout 90m $< -- -namespace=operators -olmNamespace=operator-lifecycle-manager -dummyImage=bitnami/nginx:latest -kind.images=../test/e2e-local.image.tar
 
 # this target updates the zz_chart.go file with files found in deploy/chart
 # this will always fire since it has been marked as phony
@@ -154,7 +154,7 @@ bin/e2e-local.test: FORCE test/e2e/assets/chart/zz_chart.go
 
 # set go env and other vars, ensure that the dockerfile exists, and then build wait, cpb, and other command binaries and finally the kind image archive
 test/e2e-local.image.tar: export GOOS=linux
-test/e2e-local.image.tar: export GOARCH=amd64
+test/e2e-local.image.tar: export GOARCH=386
 test/e2e-local.image.tar: build_cmd=build
 test/e2e-local.image.tar: e2e.Dockerfile bin/wait bin/cpb $(CMDS)
 	docker build -t quay.io/operator-framework/olm:local -f $< bin

test/e2e/util_test.go

@@ -48,7 +48,7 @@ import (
 
 const (
 	pollInterval = 1 * time.Second
-	pollDuration = 10 * time.Minute
+	pollDuration = 5 * time.Minute
 
 	olmConfigMap = "olm-operators" // No-longer used, how long do we keep this around?