diff --git a/docs/devel/development.md b/docs/devel/development.md index 18870b288ce..050419e243e 100644 --- a/docs/devel/development.md +++ b/docs/devel/development.md @@ -110,7 +110,7 @@ unique places you need to update the go version. - The image for cross compiling in [build-tools/build-image/cross/](../../build-tools/build-image/cross/). The `VERSION` file and `Dockerfile`. - Update [dockerized-e2e-runner.sh](https://github.com/kubernetes/test-infra/blob/master/jenkins/dockerized-e2e-runner.sh) to run a kubekins-e2e with the desired go version, which requires pushing [e2e-image](https://github.com/kubernetes/test-infra/tree/master/jenkins/e2e-image) and [test-image](https://github.com/kubernetes/test-infra/tree/master/jenkins/test-image) images that are `FROM` the desired go version. -- The docker image being run in [hack/jenkins/gotest-dockerized.sh](../../hack/jenkins/gotest-dockerized.sh). +- The docker image being run in [gotest-dockerized.sh](https://github.com/kubernetes/test-infra/tree/master/jenkins/gotest-dockerized.sh). - The cross tag `KUBE_BUILD_IMAGE_CROSS_TAG` in [build-tools/common.sh](../../build-tools/common.sh) ## Workflow diff --git a/hack/jenkins/gotest-dockerized.sh b/hack/jenkins/gotest-dockerized.sh deleted file mode 100755 index a345b6c9678..00000000000 --- a/hack/jenkins/gotest-dockerized.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Copyright 2015 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit -set -o nounset -set -o pipefail -set -o xtrace - -export REPO_DIR=${REPO_DIR:-$(pwd)} -export HOST_ARTIFACTS_DIR=${WORKSPACE}/_artifacts -mkdir -p "${HOST_ARTIFACTS_DIR}" - -# Run the kubekins container, mapping in docker (so we can launch containers), -# the repo directory, and the artifacts output directory. -# -# Note: We pass in the absolute path to the repo on the host as an env var incase -# any tests that get run need to launch containers that also map volumes. -# This is required because if you do -# -# $ docker run -v $PATH:/container/path ... -# -# From _inside_ a container that has the host's docker mapped in, the $PATH -# provided must be resolvable on the *HOST*, not the container. - -docker run --rm=true \ - --privileged=true \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -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}" \ - -e "HOST_ARTIFACTS_DIR=${HOST_ARTIFACTS_DIR}" \ - -i gcr.io/k8s-testimages/kubekins-test:1.5-v20161109-d9a98f2 \ - bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"