Browse code

Verify protobuf during runs

Force PATH on update-generated-protobuf

Run verify-generated-protobuf.sh during test-end-to-end

We don't assume docker elsewhere, so for now we'll put it in this step
and then move it later.

Clayton Coleman authored on 2016/07/19 12:15:25
Showing 2 changed files
... ...
@@ -126,6 +126,7 @@ test-cmd: build
126 126
 # Example:
127 127
 #   make test-end-to-end
128 128
 test-end-to-end: build
129
+	hack/env hack/verify-generated-protobuf.sh # Test the protobuf serializations when we know Docker is available
129 130
 	hack/test-end-to-end.sh
130 131
 .PHONY: test-end-to-end
131 132
 
... ...
@@ -19,9 +19,16 @@ if [[ -z "$(which protoc)" || "$(protoc --version)" != "libprotoc 3.0."* ]]; the
19 19
   exit 1
20 20
 fi
21 21
 
22
+if [[ -z "$(which goimports)" ]]; then
23
+  echo "goimports is required to be present on your path in order to format the generated"
24
+  echo "protobuf files"
25
+  echo
26
+  exit 1
27
+fi
28
+
22 29
 os::build::setup_env
23 30
 
24
-hack/build-go.sh tools/genprotobuf vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
31
+"${OS_ROOT}/hack/build-go.sh" tools/genprotobuf vendor/k8s.io/kubernetes/cmd/libs/go2idl/go-to-protobuf/protoc-gen-gogo
25 32
 genprotobuf="$( os::build::find-binary genprotobuf )"
26 33
 
27 34
 if [[ -z "${genprotobuf}" ]]; then
... ...
@@ -32,4 +39,4 @@ if [[ -z "${genprotobuf}" ]]; then
32 32
 	exit 1
33 33
 fi
34 34
 
35
-${genprotobuf} --output-base="${GOPATH}/src" "$@"
36 35
\ No newline at end of file
36
+PATH="$( dirname "${genprotobuf}" ):${PATH}" ${genprotobuf} --output-base="${GOPATH}/src" "$@"
37 37
\ No newline at end of file