scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests from Go 1.5.2 to Go 1.5.3

Browse Source
This commit is contained in:
Jeff Grafton
2016-01-20 16:24:51 -08:00
parent 79e0c9f5e5
commit 0d84b49f65
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -11,7 +11,7 @@ language: go
matrix: matrix:
include: include:
- go: 1.5.2 - go: 1.5.3
install: install:
- go get github.com/tools/godep - go get github.com/tools/godep

2
cluster/images/etcd/build-etcd.sh
View File

@@ -27,7 +27,7 @@ TAG=$1
ARCH=$2 ARCH=$2
TARGET_DIR=$3 TARGET_DIR=$3
GOLANG_VERSION=${GOLANG_VERSION:-1.5.2} GOLANG_VERSION=${GOLANG_VERSION:-1.5.3}
GOARM=6 GOARM=6
# Create the ${TARGET_DIR} directory, if it doesn't exist # Create the ${TARGET_DIR} directory, if it doesn't exist

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

@@ -42,5 +42,5 @@ docker run --rm=true \
-v "${REPO_DIR}":/go/src/k8s.io/kubernetes \ -v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
-v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \ -v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \
--env REPO_DIR="${REPO_DIR}" \ --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" 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.5.2 FROM golang:1.5.3
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

@@ -1,6 +1,6 @@
all: push all: push
TAG = 0.6 TAG = 0.7
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .

2
shippable.yml
View File

@@ -4,7 +4,7 @@ language: go
matrix: matrix:
include: include:
- go: 1.5.2 - go: 1.5.3
env: env:
- KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=registry - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=registry
- KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults"