Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update tests from Go 1.5.2 to Go 1.5.3 #19897

Merged
merged 1 commit into from
Jan 21, 2016
Merged

Update tests from Go 1.5.2 to Go 1.5.3 #19897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ language: go

matrix:
include:
- go: 1.5.2
- go: 1.5.3

install:
- go get github.com/tools/godep
Expand Down
4 changes: 2 additions & 2 deletions cluster/images/etcd/build-etcd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,4 +54,4 @@ else

# Move the contents in bin to the target directory
mv ${TARGET_DIR}/bin/* ${TARGET_DIR}
fi
fi
2 changes: 1 addition & 1 deletion hack/jenkins/gotest-dockerized.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion hack/jenkins/test-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <jeffml@google.com>

ENV WORKSPACE /workspace
Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/test-image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
all: push

TAG = 0.6
TAG = 0.7

container:
docker build -t gcr.io/google_containers/kubekins-test .
Expand Down
2 changes: 1 addition & 1 deletion shippable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down