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

Make kubemark work on Jenkins

Browse Source
This commit is contained in:
gmarek 2015-10-01 14:46:35 +02:00
parent 99e2605302
commit 9a74980da2
5 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/images/kubemark/Dockerfile
View File

@ -1,7 +1,6 @@
FROM debian:jessie FROM debian:jessie
COPY kubemark.sh /kubemark.sh COPY kubemark.sh /kubemark.sh
COPY kubernetes-server-linux-amd64.tar.gz /tmp/kubemark.tar.gz RUN chmod a+x /kubemark.sh
COPY build-kubemark.sh /build-kubemark.sh
RUN /build-kubemark.sh COPY kubemark /kubemark

5
cluster/images/kubemark/Makefile
View File

@ -1,9 +1,8 @@
# build Kubemark image from currently built binaries containing both 'real' master and Hollow Node # build Kubemark image from currently built binaries containing both 'real' master and Hollow Node.
# This makefile assumes that the kubemark binary is present in this directory.
all: all:
cp ../../../_output/release-tars/kubernetes-server-linux-amd64.tar.gz .
docker build -t gcr.io/$(PROJECT)/kubemark . docker build -t gcr.io/$(PROJECT)/kubemark .
gcloud docker push gcr.io/$(PROJECT)/kubemark gcloud docker push gcr.io/$(PROJECT)/kubemark
rm kubernetes-server-linux-amd64.tar.gz
.PHONY: all .PHONY: all

3
cluster/images/kubemark/build-kubemark.sh
View File

@ -23,8 +23,7 @@ update-ca-certificates
chmod a+x /kubemark.sh chmod a+x /kubemark.sh
tar xzf /tmp/kubemark.tar.gz cp kubemark /
cp kubernetes/server/bin/kubemark /
rm -rf /tmp/* rm -rf /tmp/*
apt-get clean -y apt-get clean -y

1
hack/lib/golang.sh
View File

@ -87,6 +87,7 @@ readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}")
readonly KUBE_TEST_PORTABLE=( readonly KUBE_TEST_PORTABLE=(
test/images/network-tester/rc.json test/images/network-tester/rc.json
test/images/network-tester/service.json test/images/network-tester/service.json
test/kubemark
hack/e2e.go hack/e2e.go
hack/e2e-internal hack/e2e-internal
hack/ginkgo-e2e.sh hack/ginkgo-e2e.sh

41
test/kubemark/start-kubemark.sh
View File

@ -15,6 +15,7 @@
# limitations under the License. # limitations under the License.
# Script that creates a Kubemark cluster with Master running on GCE. # Script that creates a Kubemark cluster with Master running on GCE.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source "${KUBE_ROOT}/cluster/kubemark/config-default.sh" source "${KUBE_ROOT}/cluster/kubemark/config-default.sh"
@ -23,9 +24,24 @@ source "${KUBE_ROOT}/cluster/kubemark/util.sh"
detect-project &> /dev/null detect-project &> /dev/null
export PROJECT export PROJECT
RUN_FROM_DISTRO=${RUN_FROM_DISTRO:-false}
MAKE_DIR="${KUBE_ROOT}/cluster/images/kubemark"
if [ "${RUN_FROM_DISTRO}" == "false" ]; then
# Running from repository
cp "${KUBE_ROOT}/_output/release-stage/server/linux-amd64/kubernetes/server/bin/kubemark" "${MAKE_DIR}"
else
cp "${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" "."
tar -xzf kubernetes-server-linux-amd64.tar.gz
cp "kubernetes/server/bin/kubemark" "${MAKE_DIR}"
rm -rf "kubernetes-server-linux-amd64.tar.gz" "kubernetes"
fi
CURR_DIR=`pwd` CURR_DIR=`pwd`
cd ${KUBE_ROOT}/cluster/images/kubemark cd "${MAKE_DIR}"
make make
rm kubemark
cd $CURR_DIR cd $CURR_DIR
MASTER_NAME="hollow-cluster-master" MASTER_NAME="hollow-cluster-master"
@ -49,17 +65,26 @@ gcloud compute instances create ${MASTER_NAME} \
MASTER_IP=`gcloud compute instances describe hollow-cluster-master --zone=${ZONE} | grep networkIP | cut -f2 -d":" | sed "s/ //g"` MASTER_IP=`gcloud compute instances describe hollow-cluster-master --zone=${ZONE} | grep networkIP | cut -f2 -d":" | sed "s/ //g"`
until gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="ls" &> /dev/null; do until gcloud compute ssh --zone="${ZONE}" hollow-cluster-master --command="ls" &> /dev/null; do
sleep 1 sleep 1
done done
gcloud compute copy-files --zone=${ZONE} \ if [ "${RUN_FROM_DISTRO}" == "false" ]; then
${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz \ gcloud compute copy-files --zone="${ZONE}" \
${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh \ "${KUBE_ROOT}/_output/release-tars/kubernetes-server-linux-amd64.tar.gz" \
${KUBE_ROOT}/test/kubemark/configure-kubectl.sh \ "${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh" \
hollow-cluster-master:~ "${KUBE_ROOT}/test/kubemark/configure-kubectl.sh" \
"hollow-cluster-master":~
else
gcloud compute copy-files --zone="${ZONE}" \
"${KUBE_ROOT}/server/kubernetes-server-linux-amd64.tar.gz" \
"${KUBE_ROOT}/test/kubemark/start-kubemark-master.sh" \
"${KUBE_ROOT}/test/kubemark/configure-kubectl.sh" \
"hollow-cluster-master":~
fi
gcloud compute ssh --zone=${ZONE} hollow-cluster-master --command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && sudo ./start-kubemark-master.sh" gcloud compute ssh --zone=${ZONE} hollow-cluster-master \
--command="chmod a+x configure-kubectl.sh && chmod a+x start-kubemark-master.sh && sudo ./start-kubemark-master.sh"
sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json sed "s/##masterip##/\"${MASTER_IP}\"/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet_template.json > ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json
sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json sed -i'' -e "s/##numreplicas##/${NUM_MINIONS:-10}/g" ${KUBE_ROOT}/test/kubemark/hollow-kubelet.json