[WIP]Create separate Go module for OTE test extension and migrating OCP-25806 to component repo #563
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| /openshift-apiserver | ||
| /_output | ||
| .idea | ||
| /test/extended/tests-extension/bin/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| [ | ||
| { | ||
| "name": "[Jira:openshift-apiserver][sig-api-machinery] sanity test should always pass [Suite:openshift/openshift-apiserver/conformance/parallel]", | ||
| "labels": {}, | ||
| "resources": { | ||
| "isolation": {} | ||
| }, | ||
| "source": "openshift:payload:openshift-apiserver", | ||
| "lifecycle": "blocking", | ||
| "environmentSelector": {} | ||
| }, | ||
| { | ||
| "name": "[Jira:openshift-apiserver][sig-api-machinery][openshift-apiserver][encryption] Force encryption key rotation for etcd datastore should rotate keys and update encryption prefixes [Slow][Serial][Disruptive][Suite:openshift/openshift-apiserver/conformance/serial]", | ||
| "labels": {}, | ||
| "resources": { | ||
| "isolation": {} | ||
| }, | ||
| "source": "openshift:payload:openshift-apiserver", | ||
| "lifecycle": "blocking", | ||
| "environmentSelector": {} | ||
| } | ||
| ] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| # Get the directory where this Makefile is, so we can use it below for including | ||
| DIR := $(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))) | ||
|
|
||
| # Definitions for the extended tests | ||
| GO_PKG_NAME := github.com/openshift-eng/openshift-tests-extension | ||
|
|
||
| GIT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo 'unknown') | ||
| BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ') | ||
| GIT_TREE_STATE := $(shell if git rev-parse --git-dir > /dev/null 2>&1; then if git diff --quiet; then echo clean; else echo dirty; fi; else echo unknown; fi) | ||
|
|
||
| LDFLAGS := -X '$(GO_PKG_NAME)/pkg/version.CommitFromGit=$(GIT_COMMIT)' \ | ||
| -X '$(GO_PKG_NAME)/pkg/version.BuildDate=$(BUILD_DATE)' \ | ||
| -X '$(GO_PKG_NAME)/pkg/version.GitTreeState=$(GIT_TREE_STATE)' | ||
|
|
||
| METADATA := $(shell pwd)/.openshift-tests-extension | ||
|
|
||
| TOOLS_BIN_DIR := $(CURDIR)/bin | ||
| BINARY_NAME := openshift-apiserver-tests-ext | ||
|
|
||
| .PHONY: help | ||
| help: #HELP Display essential help. | ||
| @awk 'BEGIN {FS = ":[^#]*#HELP"; printf "\nUsage:\n make \033[36m<target>\033[0m\n\n"} /^[a-zA-Z_0-9-]+:.*#HELP / { printf " \033[36m%-17s\033[0m %s\n", $$1, $$2 } ' $(MAKEFILE_LIST) | ||
|
|
||
| #SECTION Development | ||
| .PHONY: verify #HELP To verify the code | ||
| verify: tidy fmt vet | ||
|
|
||
| .PHONY: tidy #HELP Run go mod tidy. | ||
| tidy: | ||
| go mod tidy | ||
|
|
||
| .PHONY: fmt | ||
| fmt: #HELP Run go fmt against code. | ||
| go fmt ./... | ||
|
|
||
| .PHONY: vet | ||
| vet: #HELP Run go vet against code. | ||
| go vet ./... | ||
|
|
||
| .PHONY: build | ||
| build: #HELP Build the extended tests binary | ||
| @mkdir -p $(TOOLS_BIN_DIR) | ||
| GO_COMPLIANCE_POLICY="exempt_all" CGO_ENABLED=0 go build -mod=mod -ldflags "$(LDFLAGS)" -o $(TOOLS_BIN_DIR)/$(BINARY_NAME) ./cmd/... | ||
|
|
||
| .PHONY: update-metadata | ||
| update-metadata: build #HELP Build and run 'update-metadata' to generate test metadata | ||
| $(TOOLS_BIN_DIR)/$(BINARY_NAME) update | ||
| $(MAKE) clean-metadata | ||
|
|
||
| .PHONY: build-update | ||
| build-update: build update-metadata #HELP Build and update metadata and sanitize output | ||
|
|
||
| .PHONY: clean | ||
| clean: #HELP Remove build artifacts | ||
| rm -rf $(TOOLS_BIN_DIR) | ||
|
|
||
| #SECTION Metadata | ||
|
|
||
| .PHONY: list-test-names | ||
| list-test-names: build #HELP Show current full test names | ||
| @$(TOOLS_BIN_DIR)/$(BINARY_NAME) list -o names | ||
|
|
||
| .PHONY: clean-metadata | ||
| clean-metadata: #HELP Remove 'codeLocations' from metadata JSON | ||
| @echo "Cleaning metadata (removing codeLocations)..." | ||
| @for f in $(METADATA)/*.json; do \ | ||
| jq 'map(del(.codeLocations))' "$$f" > "$$f.tmp" && mv "$$f.tmp" "$$f"; \ | ||
| done | ||
|
|
||
| .PHONY: verify-metadata #HELP To verify that the metadata was properly updated | ||
| 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."; \ | ||
| exit 1; \ | ||
| fi | ||
|
Comment on lines
+70
to
+75
There was a problem hiding this comment. Fix absolute path in git diff check. The Apply this diff to use a relative path: .PHONY: verify-metadata #HELP To verify that the metadata was properly updated
verify-metadata: update-metadata
- @if ! git diff --exit-code $(METADATA); then \
+ @if ! git diff --exit-code .openshift-tests-extension; then \
echo "ERROR: Metadata is out of date. Please run 'make build-update' and commit the result."; \
exit 1; \
fi
🧰 Tools🪛 checkmake (0.2.2)[warning] 70-70: Missing required phony target "all" (minphony) [warning] 70-70: Missing required phony target "test" (minphony) 🤖 Prompt for AI Agents |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle empty metadata glob to avoid jq errors.
The loop over
$(METADATA)/*.jsonwill fail if no JSON files exist—the glob expands to a literal string when there are no matches, causing jq to fail. Add a guard to skip non-existent files.Apply this diff to handle the empty glob case:
📝 Committable suggestion
🤖 Prompt for AI Agents