aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-03-10 19:22:45 +0000
committerGerrit Code Review <review@openstack.org>2021-03-10 19:22:45 +0000
commit3c5e0f9f28476307f0c54e2ed3cb0de67d29ea1f (patch)
tree5b1372f1eed0cfd36a6167fe559debf49c018f7c
parentc2360f549e490f76f87880cbbd484a1fee1bc38f (diff)
parent191b46ef40b5e33cf1581a89e8ce7ab699df44d8 (diff)
downloadkolla-ansible-3c5e0f9f28476307f0c54e2ed3cb0de67d29ea1f.tar.gz
kolla-ansible-3c5e0f9f28476307f0c54e2ed3cb0de67d29ea1f.zip
Merge "Reduce number of logs and disable ara HTML report"
-rw-r--r--tests/get_logs.sh4
-rw-r--r--tests/post.yml12
2 files changed, 4 insertions, 12 deletions
diff --git a/tests/get_logs.sh b/tests/get_logs.sh
index a26043b99..10393eb05 100644
--- a/tests/get_logs.sh
+++ b/tests/get_logs.sh
@@ -11,6 +11,8 @@ copy_logs() {
rm ${LOG_DIR}/kolla_configs/config/ironic/ironic-agent.{kernel,initramfs}
mkdir ${LOG_DIR}/system_configs/
cp -rL /etc/{hostname,hosts,host.conf,resolv.conf,nsswitch.conf,docker,systemd} ${LOG_DIR}/system_configs/
+ # Remove /var/log/kolla link to not double the data uploaded
+ unlink /var/log/kolla
cp -rvnL /var/log/* ${LOG_DIR}/system_logs/
@@ -120,6 +122,8 @@ copy_logs() {
done
chmod -R 777 ${LOG_DIR}
+
+ du -sm ${LOG_DIR}
}
copy_logs
diff --git a/tests/post.yml b/tests/post.yml
index 535fa953e..c86dcfd94 100644
--- a/tests/post.yml
+++ b/tests/post.yml
@@ -72,16 +72,4 @@
dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/ara-report/"
mode: pull
- - name: Generate HTML from ARA database
- command: "ara generate html {{ ansible_env.HOME }}/ara-html"
- environment:
- ARA_DATABASE: "sqlite:///{{ ansible_env.HOME }}/.ara/ansible.sqlite"
-
- - name: Download ARA HTML
- synchronize:
- src: "{{ ansible_env.HOME }}/ara-html"
- dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/ara-report/"
- mode: pull
- rsync_opts:
- - "--quiet"
when: ara_stat_result.stat.exists