From 25739edbd37c15b56285fd2817cfa02c7c905bc8 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Tue, 12 Oct 2021 14:55:51 +1100
Subject: [PATCH] allow update process to fail ... likely nodes need to be
 rebooted more cleanly

---
 .gitlab-ci.yml              | 2 +-
 CICD/upgrade_and_reboot.yml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a711d656..24420a8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,7 @@ ansible_create_cluster_stage:
     - export ANSIBLE_HOST_KEY_CHECKING=False
     - export ANSIBLE_CONFIG=`pwd`/ansible.cfg
     - ansible -i inventory.yml -m ping 'all'
-    - ansible-playbook -i inventory.yml upgrade_and_reboot.yml
+    - ansible-playbook -i inventory.yml upgrade_and_reboot.yml || true
     - ansible-playbook -i inventory.yml master_playbook.yml
     - sleep 15
     - echo uglyuglyfix
diff --git a/CICD/upgrade_and_reboot.yml b/CICD/upgrade_and_reboot.yml
index 182e604e..55990af5 100644
--- a/CICD/upgrade_and_reboot.yml
+++ b/CICD/upgrade_and_reboot.yml
@@ -1,5 +1,8 @@
-- hosts: 'all'
+- hosts: 'all:!BastionNodes'
+  tasks:
+    - { apt: { update_cache: yes, upgrade: dist }, register: upgrade, become: true }
+    - { reboot: {}, when: upgrade.changed, become: true }
+- hosts: 'BastionNodes'
   tasks:
     - { apt: { update_cache: yes, upgrade: dist }, register: upgrade, become: true }
     - { reboot: {}, when: upgrade.changed, become: true }
-      #- { reboot: {}, become: true }
-- 
GitLab