diff --git a/.travis.yml b/.travis.yml index 8582a28e927..e7792337da8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ language: go matrix: include: - - go: 1.5.2 + - go: 1.5.3 install: - go get github.com/tools/godep diff --git a/cluster/images/etcd/build-etcd.sh b/cluster/images/etcd/build-etcd.sh index 0573d33d4e6..cdc897751fc 100755 --- a/cluster/images/etcd/build-etcd.sh +++ b/cluster/images/etcd/build-etcd.sh @@ -27,7 +27,7 @@ TAG=$1 ARCH=$2 TARGET_DIR=$3 -GOLANG_VERSION=${GOLANG_VERSION:-1.5.2} +GOLANG_VERSION=${GOLANG_VERSION:-1.5.3} GOARM=6 # Create the ${TARGET_DIR} directory, if it doesn't exist @@ -54,4 +54,4 @@ else # Move the contents in bin to the target directory mv ${TARGET_DIR}/bin/* ${TARGET_DIR} -fi \ No newline at end of file +fi diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh index ab44d69e419..37c89ddefcf 100755 --- a/hack/jenkins/gotest-dockerized.sh +++ b/hack/jenkins/gotest-dockerized.sh @@ -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.6 \ + -i gcr.io/google_containers/kubekins-test:0.7 \ bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh" diff --git a/hack/jenkins/test-image/Dockerfile b/hack/jenkins/test-image/Dockerfile index 2fb3928f08d..bc8f10bbee0 100644 --- a/hack/jenkins/test-image/Dockerfile +++ b/hack/jenkins/test-image/Dockerfile @@ -15,7 +15,7 @@ # This file creates a build environment for building and running kubernetes # unit and integration tests -FROM golang:1.5.2 +FROM golang:1.5.3 MAINTAINER Jeff Lowdermilk ENV WORKSPACE /workspace diff --git a/hack/jenkins/test-image/Makefile b/hack/jenkins/test-image/Makefile index 650e0f98109..d805d5e5665 100644 --- a/hack/jenkins/test-image/Makefile +++ b/hack/jenkins/test-image/Makefile @@ -1,6 +1,6 @@ all: push -TAG = 0.6 +TAG = 0.7 container: docker build -t gcr.io/google_containers/kubekins-test . diff --git a/shippable.yml b/shippable.yml index 614f65f2d6e..7f6d23cb5a8 100644 --- a/shippable.yml +++ b/shippable.yml @@ -4,7 +4,7 @@ language: go matrix: include: - - go: 1.5.2 + - go: 1.5.3 env: - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=registry - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults"