UPSTREAM: <carry>: Add tests-extension verify-metadata to verify

Signed-off-by: Todd Short <todd.short@me.com>

Author: tmshort

openshift/Makefile

@@ -21,6 +21,7 @@ export GO_BUILD_LDFLAGS := -s -w -X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)'
 verify: ## Run downstream-specific verify
 	$(MAKE) tidy fmt generate -C $(DIR)/../
 	$(MAKE) manifests
+	$(MAKE) -C tests-extension verify-metadata
 	git diff --exit-code
 
 .PHONY: manifests

openshift/tests-extension/Makefile

@@ -143,8 +143,8 @@ clean-metadata: #HELP Remove 'codeLocations' from metadata JSON
 	@jq 'map(del(.codeLocations))' $(METADATA) > $(METADATA).tmp && mv $(METADATA).tmp $(METADATA)
 
 .PHONY: verify-metadata #HELP To verify that the metadata was properly update
-verify-metadata: update-metadata
-	@if ! git diff --exit-code $(METADATA); then \
-		echo "ERROR: Metadata is out of date. Please run 'make build-update' and commit the result."; \
+verify-metadata: update-metadata bindata
+	@if ! git diff --exit-code >&/dev/null; then \
+		echo "ERROR: Metadata or bindata is out of date. Please run 'make build-update' and commit the result."; \
 		exit 1; \
 	fi