Commit fb02b33e authored by Mike Danese's avatar Mike Danese

fix build

parent 17defc73
...@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\ ...@@ -44,7 +44,7 @@ RUN mkdir -p /usr/local/src/etcd &&\
# Mark this as a kube-build container # Mark this as a kube-build container
RUN touch /kube-build-image RUN touch /kube-build-image
WORKDIR /go/src/github.com/GoogleCloudPlatform/kubernetes WORKDIR /go/src/k8s.io/kubernetes
# Propagate the git tree version into the build image # Propagate the git tree version into the build image
ADD kube-version-defs /kube-version-defs ADD kube-version-defs /kube-version-defs
...@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs ...@@ -54,4 +54,4 @@ ENV KUBE_GIT_VERSION_FILE /kube-version-defs
ENV KUBE_OUTPUT_SUBPATH _output/dockerized ENV KUBE_OUTPUT_SUBPATH _output/dockerized
# Upload Kubernetes source # Upload Kubernetes source
ADD kube-source.tar.gz /go/src/github.com/GoogleCloudPlatform/kubernetes ADD kube-source.tar.gz /go/src/k8s.io/kubernetes
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# limitations under the License. # limitations under the License.
# The golang package that we are building. # The golang package that we are building.
readonly KUBE_GO_PACKAGE=github.com/GoogleCloudPlatform/kubernetes readonly KUBE_GO_PACKAGE=k8s.io/kubernetes
readonly KUBE_GOPATH="${KUBE_OUTPUT}/go" readonly KUBE_GOPATH="${KUBE_OUTPUT}/go"
# Load contrib target functions # Load contrib target functions
......
...@@ -17,6 +17,7 @@ before_install: ...@@ -17,6 +17,7 @@ before_install:
- if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi - if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi
- if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi - if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
- export GOPATH=$SHIPPABLE_GOPATH - export GOPATH=$SHIPPABLE_GOPATH
- mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/GoogleCloudPlatform/kubernetes /root/workspace/src/k8s.io/kubernetes
install: install:
- go get golang.org/x/tools/cmd/cover - go get golang.org/x/tools/cmd/cover
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment