From e3fb8c54d03232fc06c0d06ac76cf178331ce0c9 Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Thu, 2 Dec 2021 21:30:21 +0300
Subject: [PATCH] Create the log file for the disk-image-create command

Change-Id: Iab88b3a28378cc22f767204bef84128bc9627210
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
 .../roles/bifrost-create-dib-image/defaults/main.yml      | 1 +
 playbooks/roles/bifrost-create-dib-image/tasks/main.yml   | 8 ++++++--
 scripts/collect-test-info.sh                              | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
index 87327c104..34b14a7c1 100644
--- a/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/defaults/main.yml
@@ -17,6 +17,7 @@ dib_notmpfs: false
 dib_offline: false
 dib_skipbase: false
 dib_packages: ""
+disk_image_create_log: /tmp/disk-image-create.log
 ipa_git_folder: /opt/stack/ironic-python-agent
 reqs_git_folder: /opt/stack/requirements
 ipa_builder_git_folder: /opt/stack/ironic-python-agent-builder
diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
index 696f8d0e8..19e098829 100644
--- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
+++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml
@@ -154,7 +154,7 @@
   when: partition_info is defined and 'content' in partition_info
 - name: "Build argument list"
   set_fact:
-    dib_arglist: >
+    dib_arglist: >-
       {{ dib_trace_arg | default('') }}
       {{ dib_uncompressed_arg | default('') }}
       {{ dib_clearenv_arg | default('') }}
@@ -177,7 +177,11 @@
       {{ dib_os_element }}
       {{ dib_elements | default('') }}
 - name: "Initiate image build"
-  command: disk-image-create {{ dib_arglist }}
+  shell: |
+    set -o pipefail
+    disk-image-create {{ dib_arglist }} 2>&1 | tee {{ disk_image_create_log }}
+  args:
+    executable: /bin/bash
   environment: "{{ dib_env_vars_final | combine(bifrost_venv_env) }}"
   when:
     - not build_ramdisk | bool
diff --git a/scripts/collect-test-info.sh b/scripts/collect-test-info.sh
index c8e94ed03..bf98f0323 100755
--- a/scripts/collect-test-info.sh
+++ b/scripts/collect-test-info.sh
@@ -71,6 +71,8 @@ mkdir -p ${LOG_LOCATION}/all
 sudo cp -aL /var/log/* ${LOG_LOCATION}/all/.
 sudo chown -R $USER ${LOG_LOCATION}/all
 
+[ -f /tmp/disk-image-create.log ] && sudo cp -a /tmp/disk-image-create.log ${LOG_LOCATION}
+
 sudo systemctl > ${LOG_LOCATION}/all-services.txt
 sudo journalctl -u libvirtd &> ${LOG_LOCATION}/libvirtd.log
 sudo journalctl -u ironic &> ${LOG_LOCATION}/ironic.log