Merge pull request #22834 from ixdy/verify-all

Add jq to the kubekins-test image and pass through KUBE_FORCE_VERIFY_CHECKS
This commit is contained in:
Jeff Grafton 2016-03-10 22:15:20 -08:00
commit d94ff5b83a
3 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,8 @@ docker run --rm=true \
-v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
-v "${WORKSPACE}/_artifacts":/workspace/artifacts \
-v /etc/localtime:/etc/localtime:ro \
-e "KUBE_FORCE_VERIFY_CHECKS=${KUBE_FORCE_VERIFY_CHECKS:-}" \
-e "KUBE_VERIFY_GIT_BRANCH=${KUBE_VERIFY_GIT_BRANCH:-}" \
-e "REPO_DIR=${REPO_DIR}" \
-i gcr.io/google_containers/kubekins-test:0.7 \
-i gcr.io/google_containers/kubekins-test:0.8 \
bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"

View File

@ -30,6 +30,8 @@ RUN apt-get install -y file
RUN apt-get install -y libapparmor1
# netcat is used by integration test scripts.
RUN apt-get install -y netcat-openbsd
# jq is used by hack/verify-godep-licenses.sh
RUN apt-get install -y jq
RUN mkdir -p /go/src/k8s.io/kubernetes
RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes

View File

@ -14,7 +14,7 @@
all: push
TAG = 0.7
TAG = 0.8
container:
docker build -t gcr.io/google_containers/kubekins-test .