Skip to content

Commit 3544133

Browse files
committed
Fixing arch issue
1 parent 29dcbe0 commit 3544133

File tree

1 file changed

+32
-8
lines changed

1 file changed

+32
-8
lines changed

Makefile

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,36 @@ test-e2e-preferred-host: test-unit
3939
export TP_DEPLOYMENT_YAML ?=./manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml
4040
export TP_CMD_PATH ?=./cmd/cluster-kube-controller-manager-operator
4141

42-
# Build the openshift-tests-extension binary
43-
tests-ext-build:
44-
GOOS=linux GOARCH=amd64 GO_COMPLIANCE_POLICY=exempt_all CGO_ENABLED=0 \
45-
go build -o cluster-kube-controller-manager-operator-tests-ext \
46-
-ldflags "-X 'main.CommitFromGit=$(shell git rev-parse --short HEAD)' \
47-
-X 'main.BuildDate=$(shell date -u +%Y-%m-%dT%H:%M:%SZ)' \
48-
-X 'main.GitTreeState=$(shell if git diff-index --quiet HEAD --; then echo clean; else echo dirty; fi)'" \
49-
./cmd/cluster-kube-controller-manager-operator-tests-ext
42+
# -------------------------------------------------------------------
43+
# OpenShift Tests Extension (Cluster Kube Controller Manager Operator)
44+
# -------------------------------------------------------------------
45+
TESTS_EXT_BINARY := cluster-kube-controller-manager-operator-tests-ext
46+
TESTS_EXT_DIR := ./test/extended/tests-extension
47+
48+
# -------------------------------------------------------------------
49+
# Build the test extension binary
50+
# -------------------------------------------------------------------
5051
.PHONY: tests-ext-build
52+
tests-ext-build:
53+
$(MAKE) -C $(TESTS_EXT_DIR) build
54+
55+
# -------------------------------------------------------------------
56+
# Run "update" and strip env-specific metadata
57+
# -------------------------------------------------------------------
58+
.PHONY: tests-ext-update
59+
tests-ext-update:
60+
$(MAKE) -C $(TESTS_EXT_DIR) build-update
61+
62+
# -------------------------------------------------------------------
63+
# Clean test extension binaries
64+
# -------------------------------------------------------------------
65+
.PHONY: tests-ext-clean
66+
tests-ext-clean:
67+
$(MAKE) -C $(TESTS_EXT_DIR) clean
68+
69+
# -------------------------------------------------------------------
70+
# Run test suite
71+
# -------------------------------------------------------------------
72+
.PHONY: run-suite
73+
run-suite:
74+
$(MAKE) -C $(TESTS_EXT_DIR) run-suite SUITE=$(SUITE) JUNIT_DIR=$(JUNIT_DIR)

0 commit comments

Comments
 (0)