Merge pull request #1572 from piosz/bump_test

Bumped supported Kubernetes version in integration tests

Author: mwielgus

Makefile

@@ -34,7 +34,7 @@ ifeq ($(INTERACTIVE), 1)
 	TTY=-t
 endif
 
-SUPPORTED_KUBE_VERSIONS=1.4.6
+SUPPORTED_KUBE_VERSIONS=1.5.4
 TEST_NAMESPACE=heapster-e2e-tests
 
 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
 	hooks/coverage.sh
 
 test-integration: clean build
-	go test -v --timeout=60m ./integration/... --vmodule=*=2 $(FLAGS) --namespace=$(TEST_NAMESPACE) --kube_versions=$(SUPPORTED_KUBE_VERSIONS) --test_user=$(TESTUSER)
+	go test -v --timeout=60m ./integration/... --vmodule=*=2 $(FLAGS) --namespace=$(TEST_NAMESPACE) --kube_versions=$(SUPPORTED_KUBE_VERSIONS) --test_user=$(TESTUSER) --logtostderr
 
 container:
 	# Run the build in a container in order to have reproducible builds
@@ -75,7 +75,7 @@ container:
 	cp deploy/docker/Dockerfile $(TEMP_DIR)
 	docker build --pull -t $(PREFIX)/heapster-$(ARCH):$(VERSION) $(TEMP_DIR)
 ifneq ($(OVERRIDE_IMAGE_NAME),)
-	docker tag $(PREFIX)/heapster-$(ARCH):$(VERSION) $(OVERRIDE_IMAGE_NAME)
+	docker tag -f $(PREFIX)/heapster-$(ARCH):$(VERSION) $(OVERRIDE_IMAGE_NAME)
 endif
 
 ifndef DOCKER_IN_DOCKER
@@ -110,9 +110,6 @@ push-influxdb:
 push-grafana:
 	PREFIX=$(PREFIX) make -C grafana push
 
-push-override:
-	docker push $(OVERRIDE_IMAGE_NAME)
-
 gcr-login:
 ifeq ($(findstring gcr.io,$(PREFIX)),gcr.io)
 	@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

@@ -7,7 +7,7 @@ export GOBIN="$GOPATH/bin"
 export PATH="$GOBIN:$PATH"
 
 # Kubernetes version(s) to run the integration tests against.
-kube_version="1.4.6"
+kube_version="1.5.4"
 
 if ! git diff --name-only origin/master | grep -c -E "*.go|*.sh|.*yaml|Makefile" &> /dev/null; then
   echo "This PR does not touch files that require integration testing. Skipping integration tests!"

integration/framework.go

@@ -282,6 +282,9 @@ func downloadAndSetupCluster(version string) (baseDir string, err error) {
 
 	// Setup kube cluster
 	glog.V(1).Infof("Setting up new kubernetes cluster version: %s", version)
+	if err := os.Setenv("KUBERNETES_SKIP_CONFIRM", "y"); err != nil {
+		return "", err
+	}
 	if err := setupNewCluster(kubeBaseDir); err != nil {
 		// Cluster setup failed for some reason.
 		// Attempting to validate the cluster to see if it failed in the validate phase.