Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move release-specific test env out of the kubekins-test image #16565

Merged
merged 1 commit into from
Oct 30, 2015
Merged

Move release-specific test env out of the kubekins-test image #16565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hack/jenkins/gotest-dockerized.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ docker run --rm=true \
-v "${REPO_DIR}":/go/src/k8s.io/kubernetes \
-v "${KUBE_JUNIT_REPORT_DIR}":/workspace/artifacts \
--env REPO_DIR="${REPO_DIR}" \
-i gcr.io/google_containers/kubekins-test:0.1 \
-i gcr.io/google_containers/kubekins-test:0.2 \
bash -c "cd kubernetes && ./hack/jenkins/test-dockerized.sh"
4 changes: 3 additions & 1 deletion hack/jenkins/test-dockerized.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y
export KUBE_TIMEOUT='-timeout 300s'
export KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4
export LOG_LEVEL=4
export KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1
export KUBE_TEST_ETCD_PREFIXES=registry

./hack/build-go.sh
godep go install ./...
./hack/install-etcd.sh

./hack/verify-all.sh
./hack/verify-all.sh -v

./hack/test-go.sh -- -p=2
./hack/test-cmd.sh
Expand Down
2 changes: 0 additions & 2 deletions hack/jenkins/test-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
FROM golang:1.4
MAINTAINER Jeff Lowdermilk <jeffml@google.com>

ENV KUBE_TEST_API_VERSIONS v1,extensions/v1beta1
ENV KUBE_TEST_ETCD_PREFIXES registry
ENV WORKSPACE /workspace
ENV TERM xterm

Expand Down
2 changes: 1 addition & 1 deletion hack/jenkins/test-image/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
all: push

TAG = 0.1
TAG = 0.2

container:
docker build -t gcr.io/google_containers/kubekins-test .
Expand Down