UPSTREAM: <carry>: add openshift specific build target to pass commit info downstream

Signed-off-by: Ankita Thomas <[email protected]>

Author: ankitathomas

openshift/Makefile

@@ -45,3 +45,8 @@ test-experimental-e2e: ## Run the experimental e2e tests.
 	$(DIR)/operator-controller/build-test-registry.sh $(E2E_REGISTRY_NAMESPACE) $(E2E_REGISTRY_NAME) $(E2E_REGISTRY_IMAGE)
 	cd $(DIR)/../; \
 	go test $(DOWNSTREAM_EXPERIMENTAL_E2E_FLAGS) ./test/experimental-e2e/...;
+
+export GIT_COMMIT := ${SOURCE_GIT_COMMIT}
+PHONY: go-build-local
+go-build-local:
+	$(MAKE) -n -f Makefile go-build-local

openshift/catalogd.Dockerfile

@@ -3,7 +3,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS
 ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
 WORKDIR /build
 COPY . .
-RUN make go-build-local
+RUN make -f openshift/Makefile go-build-local
 
 FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 USER 1001

openshift/operator-controller.Dockerfile

@@ -3,7 +3,7 @@ FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS
 ENV GIT_COMMIT=${SOURCE_GIT_COMMIT}
 WORKDIR /build
 COPY . .
-RUN make go-build-local && \
+RUN make -f openshift/Makefile go-build-local && \
     # Build the OLMv1 Test Extension binary.
     # This is used by openshift/origin to allow us to register the OLMv1 test extension
     # The binary needs to be added in the component image and OCP image