From 0a67f84c530419d29c0e4ac6fb08d728c8b53532 Mon Sep 17 00:00:00 2001 From: Divesh Angula Date: Wed, 22 Nov 2017 01:28:18 -0500 Subject: [PATCH] update ci env --- Jenkinsfile | 7 ++++--- tests/scripts/kubeadm-install.sh | 2 +- tests/scripts/kubeadm.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 157ecd53d..852bb7812 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,9 +67,10 @@ pipeline { stash name: 'repo-amd64',includes: 'rook-amd64.tar,build/common.sh,_output/tests/linux_amd64/,_output/charts/,tests/scripts/' script{ def data = [ - "gce_1.6": "v1.6.7", - "aws_1.7": "v1.7.8", - "gce_1.8": "v1.8.2", + "gce_1.6.1": "v1.6.1", + "gce_1.6": "v1.6.13", + "aws_1.7": "v1.7.11", + "aws_1.8": "v1.8.5" ] testruns = [:] for (kv in mapToList(data)) { diff --git a/tests/scripts/kubeadm-install.sh b/tests/scripts/kubeadm-install.sh index e6d1df9cf..5a4a93421 100755 --- a/tests/scripts/kubeadm-install.sh +++ b/tests/scripts/kubeadm-install.sh @@ -1,6 +1,6 @@ #!/bin/bash +e -KUBE_VERSION=${1:-"v1.8.2"} +KUBE_VERSION=${1:-"v1.8.5"} null_str= KUBE_INSTALL_VERSION="${KUBE_VERSION/v/$null_str}"-00 diff --git a/tests/scripts/kubeadm.sh b/tests/scripts/kubeadm.sh index 353147405..566dc0c2b 100755 --- a/tests/scripts/kubeadm.sh +++ b/tests/scripts/kubeadm.sh @@ -5,7 +5,7 @@ scriptdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" tarname=image.tar tarfile=${WORK_DIR}/tests/${tarname} -export KUBE_VERSION=${KUBE_VERSION:-"v1.8.2"} +export KUBE_VERSION=${KUBE_VERSION:-"v1.8.5"} usage(){ echo "usage:" >&2 @@ -36,7 +36,7 @@ EOF sudo systemctl daemon-reload fi - sudo kubeadm init --skip-preflight-checks + sudo kubeadm init --skip-preflight-checks --kubernetes-version ${KUBE_VERSION} sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf