Skip to content

K
k3s
Commit a57561b8 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31162 from ixdy/kubekins-docker

Automatic merge from submit-queue Use kubekins-test:v20160822 everywhere A step towards fixing #31148. We also need to update the test-infra repo to use the new e2e image. I'll fold that into https://github.com/kubernetes/test-infra/pull/419. Both gcr.io/google-containers/kubekins-test:v20160822 and gcr.io/google-containers/e2e-test:v20160822 have already been pushed.
parents 87d89a90 8e168f8d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
hack/jenkins/e2e-image/Dockerfile
View file @ a57561b8
...@@ -15,7 +15,7 @@ ...@@ -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 gcr.io/google-containers/kubekins-test:v20160810 FROM gcr.io/google-containers/kubekins-test:v20160822
MAINTAINER Erick Fejta <fejta@google.com> MAINTAINER Erick Fejta <fejta@google.com>
# Defaults of all e2e runs # Defaults of all e2e runs
......
hack/jenkins/e2e-image/Makefile
View file @ a57561b8
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
IMG = gcr.io/google-containers/kubekins-e2e IMG = gcr.io/google-containers/kubekins-e2e
TAG = $(shell date +v%Y%m%d) TAG = $(shell date +v%Y%m%d)
all: build
e2e: e2e:
cp ../../e2e.go . cp ../../e2e.go .
...@@ -30,8 +32,6 @@ upload-to-gcs.sh: ...@@ -30,8 +32,6 @@ upload-to-gcs.sh:
clean: clean:
rm -rf e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh rm -rf e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh
all: push
build: e2e e2e-runner sh2ju upload-to-gcs build: e2e e2e-runner sh2ju upload-to-gcs
docker build -t $(IMG):$(TAG) . docker build -t $(IMG):$(TAG) .
docker tag -f $(IMG):$(TAG) $(IMG):latest docker tag -f $(IMG):$(TAG) $(IMG):latest
......
hack/jenkins/gotest-dockerized.sh
View file @ a57561b8
...@@ -45,5 +45,5 @@ docker run --rm=true \ ...@@ -45,5 +45,5 @@ docker run --rm=true \
-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}" \
-e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_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}" bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"
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