diff --git a/hack/jenkins/e2e-image/Dockerfile b/hack/jenkins/e2e-image/Dockerfile index cc6d3f3a6c6..ea7dfcfe31e 100644 --- a/hack/jenkins/e2e-image/Dockerfile +++ b/hack/jenkins/e2e-image/Dockerfile @@ -15,7 +15,7 @@ # This file creates a build environment for building and running kubernetes # unit and integration tests -FROM gcr.io/google-containers/kubekins-test:v20160810 +FROM gcr.io/google-containers/kubekins-test:v20160822 MAINTAINER Erick Fejta # Defaults of all e2e runs diff --git a/hack/jenkins/e2e-image/Makefile b/hack/jenkins/e2e-image/Makefile index 1cd60a3391e..08de656ffbc 100644 --- a/hack/jenkins/e2e-image/Makefile +++ b/hack/jenkins/e2e-image/Makefile @@ -15,6 +15,8 @@ IMG = gcr.io/google-containers/kubekins-e2e TAG = $(shell date +v%Y%m%d) +all: build + e2e: cp ../../e2e.go . @@ -30,8 +32,6 @@ upload-to-gcs.sh: clean: rm -rf e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh -all: push - build: e2e e2e-runner sh2ju upload-to-gcs docker build -t $(IMG):$(TAG) . docker tag -f $(IMG):$(TAG) $(IMG):latest diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh index 95d4c51c8f4..e1f441ad7a7 100755 --- a/hack/jenkins/gotest-dockerized.sh +++ b/hack/jenkins/gotest-dockerized.sh @@ -45,5 +45,5 @@ docker run --rm=true \ -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \ -e "REPO_DIR=${REPO_DIR}" \ -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \ - -i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \ + -i gcr.io/google_containers/kubekins-test:v20160822 \ bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"