@@ -8,7 +8,7 @@ install:

   - make install-travis

 script:

-  - PERMISSIVE_GO=y make verify

+  - PROTO_OPTIONAL=1 PERMISSIVE_GO=y make verify

   - make verify-commits

 notifications:

@@ -64,21 +64,25 @@ check: | build verify

 # Example:

 #   make verify

 verify: build

-	# build-tests is disabled until we can determine why memory usage is so high

-	hack/verify-gofmt.sh

-	hack/verify-govet.sh

-	hack/verify-generated-bootstrap-bindata.sh

-	hack/verify-generated-deep-copies.sh

-	hack/verify-generated-conversions.sh

-	hack/verify-generated-clientsets.sh

-	hack/verify-generated-completions.sh

-	hack/verify-generated-docs.sh

-	hack/verify-cli-conventions.sh

-	PROTO_OPTIONAL=1 hack/verify-generated-protobuf.sh

-	hack/verify-generated-swagger-descriptions.sh

-	hack/verify-generated-swagger-spec.sh

+	# build-tests task has been disabled until we can determine why memory usage is so high

+	{ \

+	hack/verify-gofmt.sh ||r=1;\

+	hack/verify-govet.sh ||r=1;\

+	hack/verify-generated-bootstrap-bindata.sh ||r=1;\

+	hack/verify-generated-deep-copies.sh ||r=1;\

+	hack/verify-generated-conversions.sh ||r=1;\

+	hack/verify-generated-clientsets.sh ||r=1;\

+	hack/verify-generated-completions.sh ||r=1;\

+	hack/verify-generated-docs.sh ||r=1;\

+	hack/verify-cli-conventions.sh ||r=1;\

+	hack/verify-generated-protobuf.sh ||r=1;\

+	hack/verify-generated-swagger-descriptions.sh ||r=1;\

+	hack/verify-generated-swagger-spec.sh ||r=1;\

+	exit $$r ;\

+	}

 .PHONY: verify

+

 # Verify commit comments.

 #

 # Example:

@@ -98,11 +102,18 @@ update: build

 	hack/update-generated-clientsets.sh

 	hack/update-generated-completions.sh

 	hack/update-generated-docs.sh

-	PROTO_OPTIONAL=1 hack/update-generated-protobuf.sh

+	hack/update-generated-protobuf.sh

 	hack/update-generated-swagger-descriptions.sh

 	hack/update-generated-swagger-spec.sh

 .PHONY: update

+# Build and run the complete test-suite.

+#

+# Example:

+#   make test

+test: test-tools test-integration test-assets test-end-to-end

+.PHONY: test

+

 # Run unit tests.

 #

 # Args:

@@ -141,7 +152,6 @@ test-cmd: build

 # Example:

 #   make test-end-to-end

 test-end-to-end: build

-	hack/env hack/verify-generated-protobuf.sh # Test the protobuf serializations when we know Docker is available

 	hack/test-end-to-end.sh

 .PHONY: test-end-to-end

@@ -179,15 +189,6 @@ test-extended:

 	test/extended/$(SUITE).sh --ginkgo.focus="$(FOCUS)"

 .PHONY: test-extended

-# Build and run the complete test-suite.

-#

-# Example:

-#   make test

-test: check

-	$(MAKE) test-tools test-integration test-assets -o build

-	$(MAKE) test-end-to-end -o build

-.PHONY: test

-

 # Run All-in-one OpenShift server.

 #

 # Example:

@@ -225,27 +226,6 @@ release-binaries: clean

 	hack/extract-release.sh

 .PHONY: release-binaries

-# Release the integrated components for OpenShift, origin, logging, and metrics.

-# The current tag in the Origin release (the tag that points to HEAD) is used to

-# clone and build each component. Components must have a hack/release.sh script

-# which must accept env var OS_TAG as the tag to build. Each component should push

-# its own images. See hack/release.sh and hack/push-release.sh for an example of

-# the appropriate behavior.

-#

-# Prerequisites:

-# * you must be logged into the remote registry with the appropriate

-#   credentials to push.

-# * all repositories must have a Git tag equal to the current repositories tag of

-#   HEAD

-#

-# TODO: consider making hack/release.sh be a make target (make official-release).

-#

-# Example:

-#   make release-components

-release-components: clean

-	hack/release-components.sh

-.PHONY: release-components

-

 # Build the cross compiled release binaries

 #

 # Example: