github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Use kubekins-test:v20160822 everywhere

Browse Source
This commit is contained in:
Jeff Grafton 2016-08-22 14:10:20 -07:00
parent d6afd304b7
commit 8e168f8d5a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 <fejta@google.com>
# Defaults of all e2e runs

4
hack/jenkins/e2e-image/Makefile
View File

@ -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

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

@ -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}"