Skip to content

Commit 7f4ed82

Browse files
stephenfinstephenfin
committed
make: Add timeout for acceptance tests
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent cfeb6d5 commit 7f4ed82

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

‎Makefile‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ undefine GOFLAGS
22

33
GOLANGCI_LINT_VERSION?=v1.62.2
44
GO_TEST?=go run gotest.tools/gotestsum@latest --format testname --
5+
TIMEOUT := "60m"
56

67
ifeq ($(shell command -v podman 2> /dev/null),)
78
RUNNER=docker
@@ -42,77 +43,77 @@ acceptance: acceptance-basic acceptance-baremetal acceptance-blockstorage accept
4243
.PHONY: acceptance
4344

4445
acceptance-basic:
45-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack
46+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack
4647
.PHONY: acceptance-basic
4748

4849
acceptance-baremetal:
49-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/baremetal/...
50+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/baremetal/...
5051
.PHONY: acceptance-baremetal
5152

5253
acceptance-blockstorage:
53-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/blockstorage/...
54+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/blockstorage/...
5455
.PHONY: acceptance-blockstorage
5556

5657
acceptance-compute:
57-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/compute/...
58+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/compute/...
5859
.PHONY: acceptance-compute
5960

6061
acceptance-container:
61-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/container/...
62+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/container/...
6263
.PHONY: acceptance-container
6364

6465
acceptance-containerinfra:
65-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/containerinfra/...
66+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/containerinfra/...
6667
.PHONY: acceptance-containerinfra
6768

6869
acceptance-db:
69-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/db/...
70+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/db/...
7071
.PHONY: acceptance-db
7172

7273
acceptance-dns:
73-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/dns/...
74+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/dns/...
7475
.PHONY: acceptance-dns
7576

7677
acceptance-identity:
77-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/identity/...
78+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/identity/...
7879
.PHONY: acceptance-identity
7980

8081
acceptance-image:
81-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/image/...
82+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/image/...
8283
.PHONY: acceptance-image
8384

8485
acceptance-keymanager:
85-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/keymanager/...
86+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/keymanager/...
8687
.PHONY: acceptance-keymanager
8788

8889
acceptance-loadbalancer:
89-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/loadbalancer/...
90+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/loadbalancer/...
9091
.PHONY: acceptance-loadbalancer
9192

9293
acceptance-messaging:
93-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/messaging/...
94+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/messaging/...
9495
.PHONY: acceptance-messaging
9596

9697
acceptance-networking:
97-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/networking/...
98+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/networking/...
9899
.PHONY: acceptance-networking
99100

100101
acceptance-objectstorage:
101-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/objectstorage/...
102+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/objectstorage/...
102103
.PHONY: acceptance-objectstorage
103104

104105
acceptance-orchestration:
105-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/orchestration/...
106+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/orchestration/...
106107
.PHONY: acceptance-orchestration
107108

108109
acceptance-placement:
109-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/placement/...
110+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/placement/...
110111
.PHONY: acceptance-placement
111112

112113
acceptance-sharedfilesystems:
113-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/sharedfilesystems/...
114+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/sharedfilesystems/...
114115
.PHONY: acceptance-sharefilesystems
115116

116117
acceptance-workflow:
117-
$(GO_TEST) -tags "fixtures acceptance" ./internal/acceptance/openstack/workflow/...
118+
$(GO_TEST) -timeout $(TIMEOUT) -tags "fixtures acceptance" ./internal/acceptance/openstack/workflow/...
118119
.PHONY: acceptance-workflow

0 commit comments

Comments
 (0)