From c1b9660ec85eeeb01ef6f3279bdc83f8923a3a06 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <mmosesohn@mirantis.com>
Date: Fri, 17 Mar 2017 18:21:00 +0300
Subject: [PATCH] Move graceful upgrade test to debian canal HA, adjust drain
Graceful upgrades require 3 nodes
Drain now has a command timeout of 40s
---
.gitlab-ci.yml | 2 +-
roles/upgrade/pre-upgrade/tasks/main.yml | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 316c2428d..7397a450b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -267,6 +267,7 @@ before_script:
CLOUD_REGION: us-east1-b
UPGRADE_TEST: "basic"
CLUSTER_MODE: ha
+ UPGRADE_TEST: "graceful"
.rhel7_weave_variables: &rhel7_weave_variables
# stage: deploy-gce-part1
@@ -288,7 +289,6 @@ before_script:
CLOUD_IMAGE: debian-8-kubespray
CLOUD_REGION: us-central1-b
CLUSTER_MODE: default
- UPGRADE_TEST: "graceful"
.coreos_canal_variables: &coreos_canal_variables
# stage: deploy-gce-part2
diff --git a/roles/upgrade/pre-upgrade/tasks/main.yml b/roles/upgrade/pre-upgrade/tasks/main.yml
index 90b535d2e..9b47c845b 100644
--- a/roles/upgrade/pre-upgrade/tasks/main.yml
+++ b/roles/upgrade/pre-upgrade/tasks/main.yml
@@ -5,7 +5,13 @@
delegate_to: "{{ groups['kube-master'][0] }}"
- name: Drain node
- command: "{{ bin_dir }}/kubectl drain --force --ignore-daemonsets --grace-period 30 --delete-local-data {{ ansible_hostname }}"
+ command: >-
+ {{ bin_dir }}/kubectl drain
+ --force
+ --ignore-daemonsets
+ --grace-period {{ drain_grace_period }}
+ --timeout {{ drain_timeout }}
+ --delete-local-data {{ ansible_hostname }}
delegate_to: "{{ groups['kube-master'][0] }}"
- name: Sleep for grace period for draining
--
GitLab