github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Up to go 1.6.2.

Browse Source
This commit is contained in:
Joe Finney 2016-04-22 14:21:52 -07:00
parent 727eed2716
commit 009ea19bf6
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Dockerfile
View File

@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross # This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about. # platform go binary for the architecture kubernetes cares about.
FROM golang:1.6.0 FROM golang:1.6.2
ENV GOARM 6 ENV GOARM 6
ENV KUBE_DYNAMIC_CROSSPLATFORMS \ ENV KUBE_DYNAMIC_CROSSPLATFORMS \

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.6.0-2 v1.6.2-1

2
hack/jenkins/dockerized-e2e-runner.sh
View File

@ -38,5 +38,5 @@ docker run --rm=true -i \
-e "HOME=/workspace" \ -e "HOME=/workspace" \
-e "WORKSPACE=/workspace" \ -e "WORKSPACE=/workspace" \
"${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \ "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \
gcr.io/google_containers/kubekins-test:0.9 \ gcr.io/google_containers/kubekins-test:0.11 \
bash -c "bash <(curl -fsS --retry 3 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')" bash -c "bash <(curl -fsS --retry 3 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"

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 "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:0.9 \ -i gcr.io/google_containers/kubekins-test:0.11 \
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.6 FROM golang:1.6.2
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.9 TAG = 0.11
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .