Merge pull request #1109 from kuiwang02/revert-1105-addote

Revert "OCPQE-29415: UPSTREAM: <carry>: add OTE into olmv0"

Author: openshift-merge-bot[bot]

.bingo/Variables.mk

@@ -7,28 +7,16 @@ GO     ?= $(shell which go)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
 # will be used; reinstalling only if needed.
-# For example for go-bindata variable:
+# For example for helm variable:
 #
 # In your main Makefile (for non array binaries):
 #
 #include .bingo/Variables.mk # Assuming -dir was set to .bingo .
 #
-#command: $(GO_BINDATA)
-#	@echo "Running go-bindata"
-#	@$(GO_BINDATA) <flags/args..>
+#command: $(HELM)
+#	@echo "Running helm"
+#	@$(HELM) <flags/args..>
 #
-GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
-$(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/go-bindata-v3.1.2+incompatible"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.2+incompatible "github.com/go-bindata/go-bindata/go-bindata"
-
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v2.1.6
-$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v2.1.6"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v2.1.6 "github.com/golangci/golangci-lint/v2/cmd/golangci-lint"
-
 HELM := $(GOBIN)/helm-v3.15.2
 $(HELM): $(BINGO_DIR)/helm.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.

.bingo/go-bindata.mod

@@ -8,9 +8,5 @@ if [ -z "$GOBIN" ]; then
 fi
 
 
-GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
-
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v2.1.6"
-
 HELM="${GOBIN}/helm-v3.15.2"
 

.bingo/go-bindata.sum

@@ -16,15 +16,7 @@ COPY .git/refs/heads/. .git/refs/heads
 RUN mkdir -p .git/objects
 
 COPY . .
-RUN make build/olm bin/cpb && \
-    # Build the OLMv0 Test Extension binary.
-    # This is used by openshift/origin to allow us to register the OLMv0 test extension
-    # The binary needs to be added in the component image and OCP image
-    cd staging/tests-extension && \
-       make build && \
-       mkdir -p /tmp/build && \
-       cp ./bin/olmv0-tests-ext /tmp/build/olmv0-tests-ext && \
-       gzip -f /tmp/build/olmv0-tests-ext
+RUN make build/olm bin/cpb
 
 FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
 
@@ -39,7 +31,6 @@ COPY --from=builder /build/bin/package-server /bin/package-server
 COPY --from=builder /build/bin/cpb /bin/cpb
 COPY --from=builder /build/bin/psm /bin/psm
 COPY --from=builder /build/bin/copy-content /bin/copy-content
-COPY --from=builder /tmp/build/olmv0-tests-ext.gz /usr/bin/olmv0-tests-ext.gz
 
 # This image doesn't need to run as root user.
 USER 1001