Skip to content

Commit 84f6caa

Browse files
committed
Fix run-suite target and suite name typos
1 parent 9933826 commit 84f6caa

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ tests-ext-clean:
123123
# -------------------------------------------------------------------
124124
.PHONY: run-suite
125125
run-suite:
126-
$(MAKE) -C $(TESTS_EXT_DIR) run-suite SUITE=$(SUITE) ARTIFACT_DIR=$(ARTIFACT_DIR)
126+
$(MAKE) -C $(TESTS_EXT_DIR) run-suite SUITE=$(SUITE) JUNIT_DIR=$(JUNIT_DIR)
127127

128128
# -------------------------------------------------------------------
129129
# Run go test on ./test/extended/... with proper flags

test/extended/tests-extension/Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,17 @@ list-test-names: build #HELP Show current full test names
6161
@$(TOOLS_BIN_DIR)/$(BINARY_NAME) list -o names
6262

6363
.PHONY: run-suite
64-
run-suite: build #HELP Run a test suite (usage: make run-suite SUITE=<suite-name> ARTIFACT_DIR=<dir>)
64+
run-suite: build #HELP Run a test suite (usage: make run-suite SUITE=<suite-name> [JUNIT_DIR=<dir>])
6565
@if [ -z "$(SUITE)" ]; then \
66-
echo "Error: SUITE variable is required. Usage: make run-suite SUITE=<suite-name> [ARTIFACT_DIR=<dir>]"; \
66+
echo "Error: SUITE variable is required. Usage: make run-suite SUITE=<suite-name> [JUNIT_DIR=<dir>]"; \
6767
exit 1; \
6868
fi
69-
@ARTIFACT_DIR_ARG=""; \
70-
if [ -n "$(ARTIFACT_DIR)" ]; then \
71-
ARTIFACT_DIR_ARG="--artifact-dir=$(ARTIFACT_DIR)"; \
69+
@JUNIT_ARG=""; \
70+
if [ -n "$(JUNIT_DIR)" ]; then \
71+
mkdir -p $(JUNIT_DIR); \
72+
JUNIT_ARG="--junit-path=$(JUNIT_DIR)/junit.xml"; \
7273
fi; \
73-
$(TOOLS_BIN_DIR)/$(BINARY_NAME) run-suite $(SUITE) $$ARTIFACT_DIR_ARG
74+
$(TOOLS_BIN_DIR)/$(BINARY_NAME) run-suite $(SUITE) $$JUNIT_ARG
7475

7576
.PHONY: clean-metadata
7677
clean-metadata: #HELP Remove 'codeLocations' from metadata JSON

test/extended/tests-extension/cmd/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525

2626
func main() {
2727
registry := e.NewRegistry()
28-
ext := e.NewExtension("openshift", "payload", "cluster-kube-apiserve-operator")
28+
ext := e.NewExtension("openshift", "payload", "cluster-kube-apiserver-operator")
2929

3030
// Suite: conformance/parallel (fast, parallel-safe)
3131
ext.AddSuite(e.Suite{
32-
Name: "openshift/cluster-kube-apiserve-operator/conformance/parallel",
32+
Name: "openshift/cluster-kube-apiserver-operator/conformance/parallel",
3333
Parents: []string{"openshift/conformance/parallel"},
3434
Qualifiers: []string{
3535
`!(name.contains("[Serial]") || name.contains("[Slow]"))`,
@@ -38,7 +38,7 @@ func main() {
3838

3939
// Suite: conformance/serial (explicitly serial tests)
4040
ext.AddSuite(e.Suite{
41-
Name: "openshift/cluster-kube-apiserve-operator/conformance/serial",
41+
Name: "openshift/cluster-kube-apiserver-operator/conformance/serial",
4242
Parents: []string{"openshift/conformance/serial"},
4343
Qualifiers: []string{
4444
`name.contains("[Serial]")`,
@@ -47,7 +47,7 @@ func main() {
4747

4848
// Suite: optional/slow (long-running tests)
4949
ext.AddSuite(e.Suite{
50-
Name: "openshift/cluster-kube-apiserve-operator/optional/slow",
50+
Name: "openshift/cluster-kube-apiserver-operator/optional/slow",
5151
Parents: []string{"openshift/optional/slow"},
5252
Qualifiers: []string{
5353
`name.contains("[Slow]")`,
@@ -56,7 +56,7 @@ func main() {
5656

5757
// Suite: all (includes everything)
5858
ext.AddSuite(e.Suite{
59-
Name: "openshift/cluster-kube-apiserve-operator/all",
59+
Name: "openshift/cluster-kube-apiserver-operator/all",
6060
})
6161

6262
specs, err := g.BuildExtensionTestSpecsFromOpenShiftGinkgoSuite()

0 commit comments

Comments
 (0)