Skip to content

Commit 4996826

Browse files
committed
UPSTREAM: <carry>: Add tests-extension verify to openshift verify
Signed-off-by: Todd Short <todd.short@me.com>
1 parent ac96a56 commit 4996826

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

openshift/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export GO_BUILD_LDFLAGS := -s -w -X '$(VERSION_PATH).gitCommit=$(GIT_COMMIT)'
2121
verify: ## Run downstream-specific verify
2222
$(MAKE) tidy fmt generate -C $(DIR)/../
2323
$(MAKE) manifests
24+
$(MAKE) -C tests-extension verify
2425
git diff --exit-code
2526

2627
.PHONY: manifests

openshift/tests-extension/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TOOLS_BIN_DIR := $(CURDIR)/bin
4242

4343
#SECTION Development
4444
.PHONY: verify #HELP To verify the code
45-
verify: tidy fmt vet lint
45+
verify: bindata verify-metadata tidy fmt vet lint
4646

4747
.PHONY: tidy #HELP Run go mod tidy.
4848
tidy:
@@ -89,7 +89,7 @@ build: bindata #HELP Build the extended tests binary
8989
GO_COMPLIANCE_POLICY="exempt_all" go build -ldflags "$(LDFLAGS)" -mod=vendor -o $(TOOLS_BIN_DIR)/olmv1-tests-ext ./cmd/...
9090

9191
.PHONY: update-metadata
92-
update-metadata: #HELP Build and run 'update-metadata' to generate test metadata
92+
update-metadata: build #HELP Build and run 'update-metadata' to generate test metadata
9393
$(TOOLS_BIN_DIR)/olmv1-tests-ext update --component openshift:payload:olmv1
9494
$(MAKE) clean-metadata
9595

@@ -144,7 +144,7 @@ clean-metadata: #HELP Remove 'codeLocations' from metadata JSON
144144

145145
.PHONY: verify-metadata #HELP To verify that the metadata was properly update
146146
verify-metadata: update-metadata
147-
@if ! git diff --exit-code $(METADATA); then \
147+
@if ! git diff --exit-code >&/dev/null; then \
148148
echo "ERROR: Metadata is out of date. Please run 'make build-update' and commit the result."; \
149149
exit 1; \
150150
fi

0 commit comments

Comments
 (0)