Skip to content

OCPQE-31553:adjust qe sa and permission test cases per new change #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuiwang02 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPQE-31553:adjust qe sa and permission test cases per new change #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 62 additions & 2 deletions openshift/tests-extension/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,75 @@ TOOLS_BIN_DIR := $(CURDIR)/bin

#SECTION Development
.PHONY: verify #HELP To verify the code
verify: tidy fmt vet lint
verify:
@errors=0; \
warnings=0; \
failed_steps=""; \
if ! $(MAKE) tidy; then \
echo "ERROR: 'make tidy' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps tidy"; \
fi; \
if [ -n "$$PROW_JOB_ID" ]; then \
if ! $(MAKE) fmt-without-fix; then \
echo "ERROR: 'make fmt-without-fix' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps fmt"; \
fi; \
else \
files_before=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
if ! $(MAKE) fmt; then \
echo "ERROR: 'make fmt' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps fmt"; \
elif [ -n "$$files_before" ]; then \
echo "WARNING: 'make fmt' auto-fixed files. Don't forget to commit these changes!"; \
warnings=1; \
fi; \
fi; \
if ! $(MAKE) vet; then \
echo "ERROR: 'make vet' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps vet"; \
fi; \
if ! $(MAKE) lint; then \
echo "ERROR: 'make lint' failed"; \
errors=$$((errors+1)); \
failed_steps="$$failed_steps lint"; \
fi; \
if [ $$errors -gt 0 ]; then \
echo "FAILED: The following verification check(s) failed:$$failed_steps"; \
exit 1; \
elif [ $$warnings -gt 0 ]; then \
echo "WARNING: All verification checks passed, but some files were auto-fixed. Don't forget to commit!"; \
fi

.PHONY: tidy #HELP Run go mod tidy.
tidy:
go mod tidy

.PHONY: fmt
fmt: #HELP Run go fmt against code.
go fmt ./...
@files=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
echo "go fmt ./..."; \
go fmt ./...; \
if [ -n "$$files" ]; then \
echo ""; \
echo "Files have been formatted. Don't forget to commit these changes!"; \
fi

.PHONY: fmt-without-fix
fmt-without-fix: #HELP Run go fmt against code.
@files=$$(find . -name '*.go' -not -path './vendor/*' -not -path './pkg/bindata/*' -exec gofmt -l {} \;); \
echo "Checking code formatting..."; \
if [ -n "$$files" ]; then \
echo "Files that need formatting:"; \
echo "$$files"; \
echo ""; \
echo "To fix formatting, run:"; \
echo " make fmt"; \
exit 1; \
fi

.PHONY: vet
vet: #HELP Run go vet against code.
Expand Down
Loading