github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 22:20:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix up not-yet-ready build/... stuff for godep

Browse Source
This commit is contained in:
Joe Beda
2014-08-14 16:28:47 -07:00
parent 617e5c72af
commit 76baaa15b2
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/build-image/Dockerfile
View File

@@ -45,17 +45,17 @@ RUN cd /usr/local/go/src && \
# Set up Go Environment # Set up Go Environment
ENV PATH /go/bin:$PATH ENV PATH /go/bin:$PATH
ENV GOPATH /go:/go/src/github.com/GoogleCloudPlatform/kubernetes/third_party ENV GOPATH /go
ENV GOOS linux ENV GOOS linux
ENV GOARCH amd64 ENV GOARCH amd64
# Get the code coverage tool and etcd for integration tests # Get the code coverage tool and etcd for integration tests
RUN go get code.google.com/p/go.tools/cmd/cover github.com/coreos/etcd RUN go get code.google.com/p/go.tools/cmd/cover github.com/coreos/etcd github.com/tools/godep
# 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/github.com/GoogleCloudPlatform/kubernetes
# Upload Kubernetes # Upload Kubernetes source
ADD kube-source.tar.gz /go/src/github.com/GoogleCloudPlatform/kubernetes ADD kube-source.tar.gz /go/src/github.com/GoogleCloudPlatform/kubernetes

2
build/build-image/common.sh
View File

@@ -42,7 +42,7 @@ function make-binaries() {
function make-binary() { function make-binary() {
echo "+++ Building $1 for ${GOOS}/${GOARCH}" echo "+++ Building $1 for ${GOOS}/${GOARCH}"
go build \ godep go build \
-o "${ARCH_TARGET}/$1" \ -o "${ARCH_TARGET}/$1" \
github.com/GoogleCloudPlatform/kubernetes/cmd/$1 github.com/GoogleCloudPlatform/kubernetes/cmd/$1
} }

20
build/build-image/run-tests.sh
View File

@@ -19,27 +19,11 @@ set -e
source $(dirname $0)/common.sh source $(dirname $0)/common.sh
find_test_dirs() {
(
cd ${KUBE_REPO_ROOT}
find . -not \( \
\( \
-wholename './third_party' \
-o -wholename './output' \
\) -prune \
\) -name '*_test.go' -print0 | xargs -0n1 dirname | sort -u
)
}
cd "${KUBE_TARGET}"
echo "+++ Running unit tests" echo "+++ Running unit tests"
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
go test -cover -coverprofile=tmp.out "$KUBE_GO_PACKAGE/$1" godep go test -cover -coverprofile=tmp.out "$KUBE_GO_PACKAGE/$1"
exit 0 exit 0
fi fi
for package in $(find_test_dirs); do godep go test ./...
go test -cover -coverprofile=tmp.out "${KUBE_GO_PACKAGE}/${package}"
done

11
build/common.sh
View File

@@ -121,10 +121,13 @@ function build-image() {
api api
build build
cmd cmd
examples
Godeps
hack hack
LICENSE
README.md
pkg pkg
third_party third_party
LICENSE
" "
mkdir -p ${BUILD_CONTEXT_DIR} mkdir -p ${BUILD_CONTEXT_DIR}
tar czf ${BUILD_CONTEXT_DIR}/kube-source.tar.gz ${SOURCE} tar czf ${BUILD_CONTEXT_DIR}/kube-source.tar.gz ${SOURCE}
@@ -194,9 +197,9 @@ function run-build-command() {
# If the Docker server is remote, copy the results back out. # If the Docker server is remote, copy the results back out.
function copy-output() { function copy-output() {
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
# When we are on the Mac with boot2docker Now we need to copy the results # When we are on the Mac with boot2docker we need to copy the results back
# back out. Ideally we would leave the container around and use 'docker cp' # out. Ideally we would leave the container around and use 'docker cp' to
# to copy the results out. However, that doesn't work for mounted volumes # copy the results out. However, that doesn't work for mounted volumes
# currently (https://github.com/dotcloud/docker/issues/1992). And it is # currently (https://github.com/dotcloud/docker/issues/1992). And it is
# just plain broken (https://github.com/dotcloud/docker/issues/6483). # just plain broken (https://github.com/dotcloud/docker/issues/6483).
# #