github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bump ci go version to 1.5.2

Browse Source
This commit is contained in:
Mike Danese
2015-11-30 11:00:29 -08:00
parent 77a5ba6c57
commit c2753d75d2
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

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

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.3 \ -i gcr.io/google_containers/kubekins-test:0.5 \
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.4 FROM golang:1.5.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

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

11
shippable.yml
View File

@@ -4,7 +4,7 @@ language: go
matrix: matrix:
include: include:
- go: 1.4 - go: 1.5.2
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"
@@ -15,7 +15,7 @@ matrix:
- CI_PULL_REQUEST="$PULL_REQUEST" - CI_PULL_REQUEST="$PULL_REQUEST"
# Set COVERALLS_REPO_TOKEN # Set COVERALLS_REPO_TOKEN
- secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w== - secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w==
- go: 1.3 - go: 1.4
env: env:
- KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry
- KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults"
@@ -28,10 +28,9 @@ matrix:
- secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w== - secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w==
before_install: before_install:
- source $HOME/.gvm/scripts/gvm; - curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/cf746e6308ba2ff8def44bc5eddc107257139349/gimme; chmod +x /usr/local/bin/gimme
- if [[ $SHIPPABLE_GO_VERSION == "tip" ]]; then gvm install tip; gvm use tip; fi - gimme $SHIPPABLE_GO_VERSION
- if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi - source ~/.gimme/envs/go$SHIPPABLE_GO_VERSION.env
- if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi
- ./hack/install-etcd.sh - ./hack/install-etcd.sh
- export GOPATH=$SHIPPABLE_GOPATH - export GOPATH=$SHIPPABLE_GOPATH
- mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/kubernetes/kubernetes /root/workspace/src/k8s.io/kubernetes - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/kubernetes/kubernetes /root/workspace/src/k8s.io/kubernetes