Tried to find the minimal change that is not overly hard to read and
still linear. All verification steps will run before failing.
... | ... |
@@ -60,21 +60,25 @@ check: | build verify |
60 | 60 |
# Example: |
61 | 61 |
# make verify |
62 | 62 |
verify: build |
63 |
- # build-tests is disabled until we can determine why memory usage is so high |
|
64 |
- hack/verify-gofmt.sh |
|
65 |
- hack/verify-govet.sh |
|
66 |
- hack/verify-generated-bootstrap-bindata.sh |
|
67 |
- hack/verify-generated-deep-copies.sh |
|
68 |
- hack/verify-generated-conversions.sh |
|
69 |
- hack/verify-generated-clientsets.sh |
|
70 |
- hack/verify-generated-completions.sh |
|
71 |
- hack/verify-generated-docs.sh |
|
72 |
- hack/verify-cli-conventions.sh |
|
73 |
- PROTO_OPTIONAL=1 hack/verify-generated-protobuf.sh |
|
74 |
- hack/verify-generated-swagger-descriptions.sh |
|
75 |
- hack/verify-generated-swagger-spec.sh |
|
63 |
+ # build-tests task has been disabled until we can determine why memory usage is so high |
|
64 |
+ { \ |
|
65 |
+ hack/verify-gofmt.sh ||r=1;\ |
|
66 |
+ hack/verify-govet.sh ||r=1;\ |
|
67 |
+ hack/verify-generated-bootstrap-bindata.sh ||r=1;\ |
|
68 |
+ hack/verify-generated-deep-copies.sh ||r=1;\ |
|
69 |
+ hack/verify-generated-conversions.sh ||r=1;\ |
|
70 |
+ hack/verify-generated-clientsets.sh ||r=1;\ |
|
71 |
+ hack/verify-generated-completions.sh ||r=1;\ |
|
72 |
+ hack/verify-generated-docs.sh ||r=1;\ |
|
73 |
+ hack/verify-cli-conventions.sh ||r=1;\ |
|
74 |
+ hack/verify-generated-protobuf.sh ||r=1;\ |
|
75 |
+ hack/verify-generated-swagger-descriptions.sh ||r=1;\ |
|
76 |
+ hack/verify-generated-swagger-spec.sh ||r=1;\ |
|
77 |
+ exit $$r ;\ |
|
78 |
+ } |
|
76 | 79 |
.PHONY: verify |
77 | 80 |
|
81 |
+ |
|
78 | 82 |
# Verify commit comments. |
79 | 83 |
# |
80 | 84 |
# Example: |
... | ... |
@@ -94,11 +98,18 @@ update: build |
94 | 94 |
hack/update-generated-clientsets.sh |
95 | 95 |
hack/update-generated-completions.sh |
96 | 96 |
hack/update-generated-docs.sh |
97 |
- PROTO_OPTIONAL=1 hack/update-generated-protobuf.sh |
|
97 |
+ hack/update-generated-protobuf.sh |
|
98 | 98 |
hack/update-generated-swagger-descriptions.sh |
99 | 99 |
hack/update-generated-swagger-spec.sh |
100 | 100 |
.PHONY: update |
101 | 101 |
|
102 |
+# Build and run the complete test-suite. |
|
103 |
+# |
|
104 |
+# Example: |
|
105 |
+# make test |
|
106 |
+test: test-tools test-integration test-assets test-end-to-end |
|
107 |
+.PHONY: test |
|
108 |
+ |
|
102 | 109 |
# Run unit tests. |
103 | 110 |
# |
104 | 111 |
# Args: |
... | ... |
@@ -137,7 +148,6 @@ test-cmd: build |
137 | 137 |
# Example: |
138 | 138 |
# make test-end-to-end |
139 | 139 |
test-end-to-end: build |
140 |
- hack/env hack/verify-generated-protobuf.sh # Test the protobuf serializations when we know Docker is available |
|
141 | 140 |
hack/test-end-to-end.sh |
142 | 141 |
.PHONY: test-end-to-end |
143 | 142 |
|
... | ... |
@@ -175,15 +185,6 @@ test-extended: |
175 | 175 |
test/extended/$(SUITE).sh --ginkgo.focus="$(FOCUS)" |
176 | 176 |
.PHONY: test-extended |
177 | 177 |
|
178 |
-# Build and run the complete test-suite. |
|
179 |
-# |
|
180 |
-# Example: |
|
181 |
-# make test |
|
182 |
-test: check |
|
183 |
- $(MAKE) test-tools test-integration test-assets -o build |
|
184 |
- $(MAKE) test-end-to-end -o build |
|
185 |
-.PHONY: test |
|
186 |
- |
|
187 | 178 |
# Run All-in-one OpenShift server. |
188 | 179 |
# |
189 | 180 |
# Example: |
... | ... |
@@ -221,27 +222,6 @@ release-binaries: clean |
221 | 221 |
hack/extract-release.sh |
222 | 222 |
.PHONY: release-binaries |
223 | 223 |
|
224 |
-# Release the integrated components for OpenShift, origin, logging, and metrics. |
|
225 |
-# The current tag in the Origin release (the tag that points to HEAD) is used to |
|
226 |
-# clone and build each component. Components must have a hack/release.sh script |
|
227 |
-# which must accept env var OS_TAG as the tag to build. Each component should push |
|
228 |
-# its own images. See hack/release.sh and hack/push-release.sh for an example of |
|
229 |
-# the appropriate behavior. |
|
230 |
-# |
|
231 |
-# Prerequisites: |
|
232 |
-# * you must be logged into the remote registry with the appropriate |
|
233 |
-# credentials to push. |
|
234 |
-# * all repositories must have a Git tag equal to the current repositories tag of |
|
235 |
-# HEAD |
|
236 |
-# |
|
237 |
-# TODO: consider making hack/release.sh be a make target (make official-release). |
|
238 |
-# |
|
239 |
-# Example: |
|
240 |
-# make release-components |
|
241 |
-release-components: clean |
|
242 |
- hack/release-components.sh |
|
243 |
-.PHONY: release-components |
|
244 |
- |
|
245 | 224 |
# Build the cross compiled release binaries |
246 | 225 |
# |
247 | 226 |
# Example: |