mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Update tests from Go 1.5.2 to Go 1.5.3
This commit is contained in:
parent
79e0c9f5e5
commit
0d84b49f65
@ -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
|
||||||
|
@ -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
|
||||||
@ -54,4 +54,4 @@ else
|
|||||||
|
|
||||||
# Move the contents in bin to the target directory
|
# Move the contents in bin to the target directory
|
||||||
mv ${TARGET_DIR}/bin/* ${TARGET_DIR}
|
mv ${TARGET_DIR}/bin/* ${TARGET_DIR}
|
||||||
fi
|
fi
|
||||||
|
@ -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"
|
||||||
|
@ -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
|
||||||
|
@ -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 .
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user