From 71320f7a087219e93ce5ea665cd440fd6fd0fa7a Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Thu, 24 May 2018 16:01:34 +0200
Subject: [PATCH] CI: Update ironic devstack variables

* Bring VM RAM to the recommended minimum of CentOS
* Publish bare metal machine logs

Change-Id: Ic5b368875196e15d6215e82dfdcf5a0b02da925b
---
 .zuul.yaml                      |  5 ++++-
 playbooks/integration/post.yaml | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 playbooks/integration/post.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 7d80654..5b7ecd6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,6 +4,7 @@
         Base job for devstack-based metalsmith jobs.
     parent: devstack-minimal
     pre-run: playbooks/integration/pre.yaml
+    post-run: playbooks/integration/post.yaml
     irrelevant-files:
       - ^.*\.rst$
       - ^doc/.*$
@@ -21,6 +22,7 @@
       - openstack/ironic
       - openstack/metalsmith
     vars:
+      ironic_bm_logs: /opt/stack/logs/ironic-bm-logs
       devstack_services:
         dstat: true
         etcd3: true
@@ -86,8 +88,9 @@
         IRONIC_DEPLOY_DRIVER: ipmi
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_VM_COUNT: 1
+        IRONIC_VM_LOG_DIR: /opt/stack/logs/ironic-bm-logs
         IRONIC_VM_SPECS_DISK: 10
-        IRONIC_VM_SPECS_RAM: 384
+        IRONIC_VM_SPECS_RAM: 512
 
 - job:
     name: metalsmith-integration-glance
diff --git a/playbooks/integration/post.yaml b/playbooks/integration/post.yaml
new file mode 100644
index 0000000..0f0f76a
--- /dev/null
+++ b/playbooks/integration/post.yaml
@@ -0,0 +1,14 @@
+- hosts: all
+  tasks:
+    - name: Check that VM logs exist
+      stat:
+        path: '{{ ironic_bm_logs }}'
+      register: bm_logs_result
+
+    - name: Copy VM logs
+      synchronize:
+        src: '{{ ironic_bm_logs }}'
+        dest: '{{ zuul.executor.log_root }}/{{ inventory_hostname }}'
+        mode: pull
+      become: true
+      when: bm_logs_result.stat.exists