Remove some integration tests from deprecated drivers and switch more to kubeadm.

hack/jenkins/linux_integration_tests_kvm.sh

@@ -26,7 +26,7 @@
 set -e
 
 OS_ARCH="linux-amd64"
-VM_DRIVER="kvm"
+VM_DRIVER="kvm2"
 JOB_NAME="Linux-KVM"
 EXTRA_ARGS="--bootstrapper=localkube"
 EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"

hack/jenkins/linux_integration_tests_kvm_alt.sh

-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# 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 script runs the integration tests on a Linux machine for the KVM Driver
-
-# The script expects the following env variables:
-# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
-# COMMIT: Actual commit ID from upstream build
-# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
-# access_token: The Github API access token. Injected by the Jenkins credential provider. 
-
-set -e
-
-OS_ARCH="linux-amd64"
-VM_DRIVER="kvm2"
-JOB_NAME="Linux-KVM-Alt"
-EXTRA_ARGS="--bootstrapper=localkube"
-EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
-
-# Download files and set permissions
-source common.sh

hack/jenkins/linux_integration_tests_kvm_alt_kubeadm.sh

-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# 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 script runs the integration tests on a Linux machine for the KVM Driver
-
-# The script expects the following env variables:
-# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
-# COMMIT: Actual commit ID from upstream build
-# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
-# access_token: The Github API access token. Injected by the Jenkins credential provider. 
-
-set -e
-
-OS_ARCH="linux-amd64"
-VM_DRIVER="kvm2"
-JOB_NAME="Linux-KVM-Kubeadm"
-EXTRA_ARGS="--bootstrapper=kubeadm"
-
-# Download files and set permissions
-source common.sh

hack/jenkins/linux_integration_tests_none.sh

@@ -29,7 +29,7 @@ set -e
 OS_ARCH="linux-amd64"
 VM_DRIVER="none"
 JOB_NAME="Linux-None"
-EXTRA_ARGS="--bootstrapper=localkube"
+EXTRA_ARGS="--bootstrapper=kubeadm"
 EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
 
 SUDO_PREFIX="sudo -E "

hack/jenkins/osx_integration_tests_hyperkit.sh

@@ -29,7 +29,7 @@ set -e
 OS_ARCH="darwin-amd64"
 VM_DRIVER="hyperkit"
 JOB_NAME="OSX-Hyperkit"
-EXTRA_ARGS="--bootstrapper=localkube"
+EXTRA_ARGS="--bootstrapper=kubeadm"
 EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
 
 

hack/jenkins/osx_integration_tests_virtualbox_kubeadm.sh

-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# 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 script runs the integration tests on an OSX machine for the Virtualbox Driver
-
-# The script expects the following env variables:
-# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
-# COMMIT: Actual commit ID from upstream build
-# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
-# access_token: The Github API access token. Injected by the Jenkins credential provider. 
-
-
-set -e
-OS_ARCH="darwin-amd64"
-VM_DRIVER="virtualbox"
-JOB_NAME="OSX-Virtualbox-Kubeadm"
-EXTRA_ARGS="--bootstrapper=localkube"
-EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
-
-# Download files and set permissions
-source common.sh

hack/jenkins/osx_integration_tests_xhyve.sh

-#!/bin/bash
-
-# Copyright 2016 The Kubernetes Authors All rights reserved.
-#
-# 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 script runs the integration tests on an OSX machine for the XHyve Driver
-
-# The script expects the following env variables:
-# MINIKUBE_LOCATION: GIT_COMMIT from upstream build.
-# COMMIT: Actual commit ID from upstream build
-# EXTRA_BUILD_ARGS (optional): Extra args to be passed into the minikube integrations tests
-# access_token: The Github API access token. Injected by the Jenkins credential provider. 
-
-
-set -e
-
-OS_ARCH="darwin-amd64"
-VM_DRIVER="xhyve"
-JOB_NAME="OSX-Xhyve"
-EXTRA_ARGS="--bootstrapper=localkube"
-EXTRA_START_ARGS="--kubernetes-version=file://$PWD/out/localkube"
-
-
-# Download files and set permissions
-source common.sh