From 93ac16ae6bca01424fe2aebbacfb58cfa005c2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Fri, 26 Jul 2019 17:06:11 +0200
Subject: [PATCH] CI: fix checks for upgrade and multinode jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Multinode jobs did not run sanity checks for all the hosts,
only primary. Now they check all.
Additionally upgrades are now checked using the proper
(pre-upgrade) scripts (not that it matters too much as they
are the same atm) and both checks are done, not only failures,
but also config.
Change-Id: I10552e256edbddd5b1f8a8a7f8805262e72ce8d8
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
tests/run.yml | 50 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/tests/run.yml b/tests/run.yml
index cc7d61583c..c24044ac78 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -1,9 +1,17 @@
---
- hosts: all
- vars:
- kolla_ansible_local_src_dir: "{{ zuul.executor.work_root }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
- is_ceph: "{{ 'ceph' in scenario }}"
tasks:
+ # NOTE(yoctozepto): setting vars as facts for all to have them around in all the plays
+ - set_fact:
+ kolla_inventory_path: "/etc/kolla/inventory"
+ logs_dir: "/tmp/logs"
+ kolla_ansible_src_dir: "{{ ansible_env.PWD }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
+ kolla_ansible_local_src_dir: "{{ zuul.executor.work_root }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
+ need_build_image: false
+ build_image_tag: "change_{{ zuul.change | default('none') }}"
+ is_upgrade: "{{ 'upgrade' in scenario }}"
+ is_ceph: "{{ 'ceph' in scenario }}"
+
- name: Prepare disks for Ceph or LVM
script: "setup_disks.sh {{ disk_type }}"
when: scenario == "cinder-lvm" or is_ceph
@@ -13,15 +21,6 @@
ceph_storetype: "{{ hostvars[inventory_hostname].get('ceph_osd_storetype') }}"
- hosts: primary
- vars:
- kolla_inventory_path: "/etc/kolla/inventory"
- logs_dir: "/tmp/logs"
- kolla_ansible_src_dir: "{{ ansible_env.PWD }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
- kolla_ansible_local_src_dir: "{{ zuul.executor.work_root }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
- need_build_image: false
- build_image_tag: "change_{{ zuul.change | default('none') }}"
- is_upgrade: "{{ 'upgrade' in scenario }}"
- is_ceph: "{{ 'ceph' in scenario }}"
tasks:
# FIXME: in multi node env, api_interface may be different on each node.
- name: detect api_interface_name variable
@@ -233,14 +232,28 @@
when: not is_upgrade
when: scenario != "bifrost"
- # Upgrade: update config.
- - block:
- - name: Run check-failure.sh script
- script:
- cmd: check-failure.sh
+# NOTE(yoctozepto): each host checks itself
+- hosts: all
+ tasks:
+ - name: Pre-upgrade sanity checks
+ block:
+ - name: Run pre-upgrade check-failure.sh script
+ shell:
+ cmd: tests/check-failure.sh
executable: /bin/bash
chdir: "{{ kolla_ansible_src_dir }}"
+ - name: Run pre-upgrade check-config.sh script
+ shell:
+ cmd: tests/check-config.sh
+ executable: /bin/bash
+ chdir: "{{ kolla_ansible_src_dir }}"
+ when: is_upgrade
+
+- hosts: primary
+ tasks:
+ # Upgrade: update config.
+ - block:
# NOTE(mgoddard): This only affects the remote copy of the repo, not the
# one on the executor.
- name: checkout the current kolla-ansible branch
@@ -341,6 +354,9 @@
chdir: "{{ kolla_ansible_src_dir }}"
when: scenario == "bifrost"
+# NOTE(yoctozepto): each host checks itself
+- hosts: all
+ tasks:
- name: Run check-failure.sh script
shell:
cmd: tests/check-failure.sh