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

Install bc in the kubekins-test image 

It is needed by the shell2junit script.
pull/6/head
Jeff Grafton 2016-08-12 16:42:53 -07:00
parent a81732ba76
commit 7e51ee1ccd
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/dockerized-e2e-runner.sh
View File

@ -61,5 +61,5 @@ docker run --rm=true -i \
-e "WORKSPACE=/workspace" \ -e "WORKSPACE=/workspace" \
${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \ ${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \ "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev2 \ gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \
bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')" bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"

2
hack/jenkins/gotest-dockerized.sh
View File

@ -45,5 +45,5 @@ docker run --rm=true \
-e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \ -e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
-e "REPO_DIR=${REPO_DIR}" \ -e "REPO_DIR=${REPO_DIR}" \
-e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \ -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \
-i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev2 \ -i gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \
bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}" bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"

2
hack/jenkins/test-image/Dockerfile
View File

@ -26,12 +26,14 @@ ENV DOCKER_VERSION 1.9.1
WORKDIR /workspace WORKDIR /workspace
# bc is needed by shell2junit
# dnsutils is needed by federation cluster scripts. # dnsutils is needed by federation cluster scripts.
# file is used when uploading test artifacts to GCS. # file is used when uploading test artifacts to GCS.
# jq is used by hack/verify-godep-licenses.sh # jq is used by hack/verify-godep-licenses.sh
# python-pip is needed to install the AWS cli. # python-pip is needed to install the AWS cli.
# netcat is used by integration test scripts. # netcat is used by integration test scripts.
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \ RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
bc \
dnsutils \ dnsutils \
file \ file \
jq \ jq \

2
hack/jenkins/test-image/Makefile
View File

@ -16,7 +16,7 @@ all: push
# Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION # Tag format: $GO_VERSION-$EMBEDDED_DOCKER_VERSION-$REVISION
# These versions are specified in the Dockerfile # These versions are specified in the Dockerfile
TAG = go1.6.3-docker1.9.1-rev2 TAG = go1.6.3-docker1.9.1-rev3
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .