Merge pull request #2920 from travisn/support-k8s-1.14

Add k8s 1.14 to the integration test matrix
This commit is contained in:
Travis Nielsen
2019-04-26 07:56:42 -06:00
committed by GitHub
3 changed files with 8 additions and 7 deletions
Vendored
+5 -4
View File
@@ -86,10 +86,11 @@ pipeline {
stash name: 'repo-amd64',includes: 'ceph-amd64.tar,cockroachdb-amd64.tar,cassandra-amd64.tar,nfs-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/'
script{
def data = [
"aws_1.10.x": "v1.10.11",
"aws_1.11.x": "v1.11.5",
"aws_1.12.x": "v1.12.3",
"gce_1.13.x": "v1.13.1"
"aws_1.10.x": "v1.10.12",
"aws_1.11.x": "v1.11.8",
"aws_1.12.x": "v1.12.6",
"aws_1.13.x": "v1.13.4",
"aws_1.14.x": "v1.14.1"
]
testruns = [:]
for (kv in mapToList(data)) {
+2 -2
View File
@@ -34,8 +34,8 @@ install() {
# shellcheck disable=SC2021
dist=$(echo "${dist}" | tr "[A-Z]" "[a-z]")
mkdir -p "${temp}"
wget "https://storage.googleapis.com/kubernetes-helm/helm-v2.6.0-${dist}-${arch}.tar.gz" -O "${temp}/helm-v2.6.0-${dist}-${arch}.tar.gz"
tar -C "${temp}" -zxvf "${temp}/helm-v2.6.0-${dist}-${arch}.tar.gz"
wget "https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-${dist}-${arch}.tar.gz" -O "${temp}/helm.tar.gz"
tar -C "${temp}" -zxvf "${temp}/helm.tar.gz"
HELM="${temp}/${dist}-${arch}/helm"
fi
+1 -1
View File
@@ -120,7 +120,7 @@ function copy_images() {
}
# configure minikube
KUBE_VERSION=${KUBE_VERSION:-"v1.13.1"}
KUBE_VERSION=${KUBE_VERSION:-"v1.14.1"}
MEMORY=${MEMORY:-"3000"}
case "${1:-}" in