Merge pull request #13838 from mikedanese/go1.5

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-18 11:09:15 -08:00
5 changed files with 9 additions and 10 deletions

View File

@@ -42,5 +42,5 @@ docker run --rm=true \
-v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
-v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \
--env REPO_DIR="${REPO_DIR}" \
-i gcr.io/google_containers/kubekins-test:0.3 \
-i gcr.io/google_containers/kubekins-test:0.5 \
bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"

View File

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

View File

@@ -1,6 +1,6 @@
all: push
TAG = 0.3
TAG = 0.5
container:
docker build -t gcr.io/google_containers/kubekins-test .