github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28237 from ixdy/kubekins-aws

Browse Source 
Automatic merge from submit-queue

Install pip in kubekins test image and install AWS cli when needed

Follow-on to https://github.com/kubernetes/test-infra/pull/66. This fixes AWS hopefully.

I haven't pushed the image yet.

cc @fejta
This commit is contained in:
k8s-merge-robot 2016-06-30 22:07:51 -07:00 committed by GitHub
commit d8a54c7a5c
5 changed files with 9 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" \
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \ "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
"${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \ "${METADATA_SERVER_ADD_HOST_ARGS[@]:+${METADATA_SERVER_ADD_HOST_ARGS[@]}}" \
gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev1 \ gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
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')"

3
hack/jenkins/e2e-runner.sh
View File

@ -146,6 +146,9 @@ function dump_cluster_logs() {
if running_in_docker; then if running_in_docker; then
curl -fsSL --retry 3 --keepalive-time 2 -o "${WORKSPACE}/google-cloud-sdk.tar.gz" 'https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz' curl -fsSL --retry 3 --keepalive-time 2 -o "${WORKSPACE}/google-cloud-sdk.tar.gz" 'https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz'
install_google_cloud_sdk_tarball "${WORKSPACE}/google-cloud-sdk.tar.gz" / install_google_cloud_sdk_tarball "${WORKSPACE}/google-cloud-sdk.tar.gz" /
if [[ "${KUBERNETES_PROVIDER}" == 'aws' ]]; then
pip install awscli
fi
fi fi
# Install gcloud from a custom path if provided. Used to test GKE with gcloud # Install gcloud from a custom path if provided. Used to test GKE with gcloud

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

@ -44,5 +44,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.2-docker1.9.1-rev1 \ -i gcr.io/google_containers/kubekins-test:go1.6.2-docker1.9.1-rev2 \
bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}" bash -c "cd kubernetes && ${KUBE_TEST_SCRIPT:-./hack/jenkins/test-dockerized.sh}"

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

@ -29,17 +29,20 @@ WORKDIR /workspace
# 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.
# netcat is used by integration test scripts. # netcat is used by integration test scripts.
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
dnsutils \ dnsutils \
file \ file \
jq \ jq \
python-pip \
netcat-openbsd \ netcat-openbsd \
rsync \ rsync \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\ RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz" |\
tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
RUN mkdir -p /go/src/k8s.io/kubernetes RUN mkdir -p /go/src/k8s.io/kubernetes
RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes RUN ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes

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.2-docker1.9.1-rev1 TAG = go1.6.2-docker1.9.1-rev2
container: container:
docker build -t gcr.io/google_containers/kubekins-test . docker build -t gcr.io/google_containers/kubekins-test .