Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 59109b8

Browse files
authored
Merge pull request #1572 from piosz/bump_test
Bumped supported Kubernetes version in integration tests
2 parents fceafd2 + 30a7de5 commit 59109b8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ifeq ($(INTERACTIVE), 1)
3434
TTY=-t
3535
endif
3636

37-
SUPPORTED_KUBE_VERSIONS=1.4.6
37+
SUPPORTED_KUBE_VERSIONS=1.5.4
3838
TEST_NAMESPACE=heapster-e2e-tests
3939

4040
HEAPSTER_LDFLAGS=-w -X k8s.io/heapster/version.HeapsterVersion=$(VERSION) -X k8s.io/heapster/version.GitCommit=$(GIT_COMMIT)
@@ -62,7 +62,7 @@ test-unit-cov: clean sanitize build
6262
hooks/coverage.sh
6363

6464
test-integration: clean build
65-
go test -v --timeout=60m ./integration/... --vmodule=*=2 $(FLAGS) --namespace=$(TEST_NAMESPACE) --kube_versions=$(SUPPORTED_KUBE_VERSIONS) --test_user=$(TESTUSER)
65+
go test -v --timeout=60m ./integration/... --vmodule=*=2 $(FLAGS) --namespace=$(TEST_NAMESPACE) --kube_versions=$(SUPPORTED_KUBE_VERSIONS) --test_user=$(TESTUSER) --logtostderr
6666

6767
container:
6868
# Run the build in a container in order to have reproducible builds
@@ -75,7 +75,7 @@ container:
7575
cp deploy/docker/Dockerfile $(TEMP_DIR)
7676
docker build --pull -t $(PREFIX)/heapster-$(ARCH):$(VERSION) $(TEMP_DIR)
7777
ifneq ($(OVERRIDE_IMAGE_NAME),)
78-
docker tag $(PREFIX)/heapster-$(ARCH):$(VERSION) $(OVERRIDE_IMAGE_NAME)
78+
docker tag -f $(PREFIX)/heapster-$(ARCH):$(VERSION) $(OVERRIDE_IMAGE_NAME)
7979
endif
8080

8181
ifndef DOCKER_IN_DOCKER
@@ -110,9 +110,6 @@ push-influxdb:
110110
push-grafana:
111111
PREFIX=$(PREFIX) make -C grafana push
112112

113-
push-override:
114-
docker push $(OVERRIDE_IMAGE_NAME)
115-
116113
gcr-login:
117114
ifeq ($(findstring gcr.io,$(PREFIX)),gcr.io)
118115
@echo "If you are pushing to a gcr.io registry, you have to be logged in via 'docker login'; 'gcloud docker push' can't push manifest lists yet."

integration/.jenkins.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export GOBIN="$GOPATH/bin"
77
export PATH="$GOBIN:$PATH"
88

99
# Kubernetes version(s) to run the integration tests against.
10-
kube_version="1.4.6"
10+
kube_version="1.5.4"
1111

1212
if ! git diff --name-only origin/master | grep -c -E "*.go|*.sh|.*yaml|Makefile" &> /dev/null; then
1313
echo "This PR does not touch files that require integration testing. Skipping integration tests!"

integration/framework.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ func downloadAndSetupCluster(version string) (baseDir string, err error) {
282282

283283
// Setup kube cluster
284284
glog.V(1).Infof("Setting up new kubernetes cluster version: %s", version)
285+
if err := os.Setenv("KUBERNETES_SKIP_CONFIRM", "y"); err != nil {
286+
return "", err
287+
}
285288
if err := setupNewCluster(kubeBaseDir); err != nil {
286289
// Cluster setup failed for some reason.
287290
// Attempting to validate the cluster to see if it failed in the validate phase.

0 commit comments

Comments
 (0)