Merge pull request #31316 from fejta/update

docs/devel/development.md

@@ -142,7 +142,7 @@ Since kubernetes is mostly built and tested in containers, there are a few
 unique places you need to update the go version.
 
 - The image for cross compiling in [build/build-image/cross/](../../build/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](../../hack/jenkins/e2e-image/) and [test-image](../../hack/jenkins/test-image/) images that are `FROM` the desired go version.
+- 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 cross tag `KUBE_BUILD_IMAGE_CROSS_TAG` in [build/common.sh](../../build/common.sh)
 

hack/jenkins/e2e-image/Dockerfile

-# Copyright 2016 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.
-
-# This file creates a build environment for building and running kubernetes
-# unit and integration tests
-
-FROM gcr.io/google-containers/kubekins-test:v20160822
-MAINTAINER  Erick Fejta <fejta@google.com>
-
-# Defaults of all e2e runs
-ENV E2E_UP=true \
-    E2E_TEST=true \
-    E2E_DOWN=true
-
-# Customize these as appropriate
-ENV E2E_PUBLISH_GREEN_VERSION=false \
-    INSTANCE_PREFIX=jenkins-e2e \
-    KUBERNETES_PROVIDER=gce
-
-# Variables specific to GCP
-ENV FAIL_ON_GCP_RESOURCE_LEAK=true \
-    JOB_NAME=kubernetes-e2e-gce-conformance \
-    KUBE_GCE_INSTANCE_PREFIX=jenkins-e2e \
-    KUBE_GCE_NETWORK=jenkins-e2e \
-    KUBE_GCE_ZONE=us-central1-f
-
-# Variable specific to the machine:
-# GOOGLE_APPLICATION_CREDENTIALS
-# JENKINS_GCE_SSH_PRIVATE_KEY_FILE
-# JENKINS_GCE_SSH_PUBLIC_KEY_FILE
-# JENKINS_AWS_SSH_PRIVATE_KEY_FILE
-# JENKINS_AWS_SSH_PUBLIC_KEY_FILE
-# JENKINS_AWS_CREDENTIALS_FILE
-
-ADD ["sh2ju.sh", "e2e-runner.sh", "e2e.go", "upload-to-gcs.sh", "${WORKSPACE}/"]
-
-ENTRYPOINT ["bash", "-c", "${WORKSPACE}/e2e-runner.sh"]

hack/jenkins/e2e-image/Makefile

-# Copyright 2016 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.
-
-IMG = gcr.io/google-containers/kubekins-e2e
-TAG = $(shell date +v%Y%m%d)
-
-all: build
-
-e2e:
-	cp ../../e2e.go .
-
-e2e-runner:
-	cp ../e2e-runner.sh .
-
-sh2ju:
-	cp ../../../third_party/forked/shell2junit/sh2ju.sh .
-
-upload-to-gcs.sh:
-	cp ../upload-to-gcs.sh .
-
-clean:
-	rm -rf e2e.go e2e-runner.sh sh2ju.sh upload-to-gcs.sh
-
-build: e2e e2e-runner sh2ju upload-to-gcs
-	docker build -t $(IMG):$(TAG) .
-	docker tag -f $(IMG):$(TAG) $(IMG):latest
-	@echo Built $(IMG):$(TAG) and tagged with latest
-
-push: build
-	gcloud docker push $(IMG):$(TAG)
-	gcloud docker push $(IMG):latest
-	@echo Pushed $(IMG) with :latest and :$(TAG) tags

hack/jenkins/test-image/Dockerfile

-# 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.
-
-# This file creates a build environment for building and running kubernetes
-# unit and integration tests
-
-FROM golang:1.6.3
-MAINTAINER  Jeff Lowdermilk <jeffml@google.com>
-
-# Setup workspace and symlink to gopath
-WORKDIR /workspace
-RUN mkdir -p /go/src/k8s.io/kubernetes /workspace \
-    && ln -s /go/src/k8s.io/kubernetes /workspace/kubernetes
-ENV WORKSPACE=/workspace \
-    TERM=xterm
-
-# Install linux packages
-# bc is needed by shell2junit
-# dnsutils is needed by federation cluster scripts.
-# file is used when uploading test artifacts to GCS.
-# 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.
-RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
-        bc \
-	dnsutils \
-	file \
-	jq \
-	python-pip \
-	netcat-openbsd \
-	rsync \
-	--no-install-recommends \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Install docker
-# Note: 1.11+ changes the tarball format
-RUN curl -L "https://get.docker.com/builds/Linux/x86_64/docker-1.9.1.tgz" \
-    | tar -C /usr/bin -xvzf- --strip-components=3 usr/local/bin/docker
-
-# Install any go packages
-# TODO(fejta): migrate this to a unit test image
-RUN go get \
-        github.com/golang/lint/golint
-

hack/jenkins/test-image/Makefile

-# Copyright 2016 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.
-
-IMG = gcr.io/google-containers/kubekins-test
-TAG = $(shell date +v%Y%m%d)
-
-all: build
-
-build:
-	docker build -t $(IMG):$(TAG) .
-	docker tag -f $(IMG):$(TAG) $(IMG):latest
-	@echo Built $(IMG):$(TAG) and tagged with $(IMG):latest
-
-push: build
-	gcloud docker push $(IMG):$(TAG)
-	gcloud docker push $(IMG):latest
-	@echo Pushed $(IMG):latest and $(IMG):$(TAG)
-