github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid duplicate building in Jenkins unit/integration job

pull/6/head
Jeff Grafton 2016-05-26 21:08:01 -07:00
parent ff4f394d1e
commit 65e10cf50c
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/test-dockerized.sh
View File

@ -52,7 +52,6 @@ export LOG_LEVEL=4
cd /go/src/k8s.io/kubernetes cd /go/src/k8s.io/kubernetes
rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated rm -rf Godeps/_workspace # Temporary until _workspace is fully obliterated
./hack/build-go.sh
go install ./cmd/... go install ./cmd/...
./hack/install-etcd.sh ./hack/install-etcd.sh

10
hack/test-cmd.sh
View File

@ -126,8 +126,13 @@ function kubectl-with-retry()
} }
kube::util::trap_add cleanup EXIT SIGINT kube::util::trap_add cleanup EXIT SIGINT
kube::util::ensure-temp-dir kube::util::ensure-temp-dir
"${KUBE_ROOT}/hack/build-go.sh" \
cmd/kubectl \
cmd/kube-apiserver \
cmd/kube-controller-manager
kube::etcd::start kube::etcd::start
ETCD_HOST=${ETCD_HOST:-127.0.0.1} ETCD_HOST=${ETCD_HOST:-127.0.0.1}
@ -164,6 +169,9 @@ kube::log::status "Running kubectl with no options"
# Only run kubelet on platforms it supports # Only run kubelet on platforms it supports
if [[ "$(go env GOHOSTOS)" == "linux" ]]; then if [[ "$(go env GOHOSTOS)" == "linux" ]]; then
"${KUBE_ROOT}/hack/build-go.sh" \
cmd/kubelet
kube::log::status "Starting kubelet in masterless mode" kube::log::status "Starting kubelet in masterless mode"
"${KUBE_OUTPUT_HOSTBIN}/kubelet" \ "${KUBE_OUTPUT_HOSTBIN}/kubelet" \
--really-crash-for-testing=true \ --really-crash-for-testing=true \