From 968bcf84eba979ba85840498dabc5e97c565494f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 9 Sep 2016 10:50:24 +0100 Subject: [PATCH] Compress test execution logs The volume of logs we collect in CI jobs are extensive. This patch ensures that the logs collected are compressed to reduce the space taken in CI systems. PYTHONUNBUFFERED is also set to ensure that the console log from the CI jobs is recorded in the exact order of execution. Change-Id: I518a677dff2722c2fd9f343fa67a801252edea1d Related-Bug: #1620849 --- bindep.txt | 3 +++ tox.ini | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bindep.txt b/bindep.txt index 931e963..fe58925 100644 --- a/bindep.txt +++ b/bindep.txt @@ -36,3 +36,6 @@ python-ndg-httpsclient [platform:ubuntu !platform:ubuntu-trusty] python2-pyasn1 [platform:rpm] pyOpenSSL [platform:rpm] python-ndg_httpsclient [platform:rpm] + +# Required for compressing collected log files in CI +gzip diff --git a/tox.ini b/tox.ini index 0bd6191..d52bcce 100644 --- a/tox.ini +++ b/tox.ini @@ -27,6 +27,7 @@ whitelist_externals = wget setenv = VIRTUAL_ENV={envdir} + PYTHONUNBUFFERED=1 [testenv:docs] @@ -156,7 +157,7 @@ commands = [testenv:functional] # Ignore_errors is set to true so that the logs are collected at the -# end of the run. This will not produce a failse positive. Any +# end of the run. This will not produce a false positive. Any # exception will be mark the run as failed and exit 1 after all of # the commands have been iterated through. ignore_errors = True @@ -176,8 +177,9 @@ commands = -e "install_test_packages=True" \ {toxinidir}/tests/test.yml -vvvv bash -c 'mkdir -p {toxinidir}/logs' - bash -c 'rsync -av --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true' - + bash -c 'rsync --archive --verbose --ignore-errors /var/log/ /openstack/log/ {toxinidir}/logs/ || true' + bash -c 'find "{toxinidir}/logs/" -type f | sed "p;s|$|.txt|" | xargs -n2 mv' + bash -c 'command gzip --best --recursive "{toxinidir}/logs/"' [testenv:linters]