github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Up unit/integration test on Jenkins to go 1.6.

Browse Source
This commit is contained in:
Joe Finney 2016-03-21 16:14:09 -07:00
parent c8c2c58afd
commit d3e94fcd78
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/gotest-dockerized.sh
View File

@ -42,5 +42,5 @@ docker run --rm=true \
-e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \ -e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \
-e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \ -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
-e "REPO_DIR=${REPO_DIR}" \ -e "REPO_DIR=${REPO_DIR}" \
-i gcr.io/google_containers/kubekins-test:0.8 \ -i gcr.io/google_containers/kubekins-test:0.9 \
bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh" bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"

2
hack/jenkins/test-image/Dockerfile
View File

@ -15,7 +15,7 @@
# This file creates a build environment for building and running kubernetes # This file creates a build environment for building and running kubernetes
# unit and integration tests # unit and integration tests
FROM golang:1.5.3 FROM golang:1.6
MAINTAINER Jeff Lowdermilk <jeffml@google.com> MAINTAINER Jeff Lowdermilk <jeffml@google.com>
ENV WORKSPACE /workspace ENV WORKSPACE /workspace

2
hack/jenkins/test-image/Makefile
View File

@ -14,7 +14,7 @@
all: push all: push
TAG = 0.8 TAG = 0.9
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .