From 406683383e63c93b3f8abc6b5bcab2715247c8b5 Mon Sep 17 00:00:00 2001 From: Ross Williams Date: Tue, 12 Oct 2021 12:57:53 +0000 Subject: [PATCH] pkgng: test jail creation logging less verbose `ezjail-admin` had been spewing every filename copied into the jail onto stderr, making the `ansible-test -v` logs hard to scroll through. Changed it so that ezjail output only shows up in the ansible task logs if `ansible_verbosity > 1` (`-vv...`). Full `ezjail-admin` output is always logged to `/tmp/ezjail.log`. --- tests/integration/targets/pkgng/tasks/setup-testjail.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/integration/targets/pkgng/tasks/setup-testjail.yml b/tests/integration/targets/pkgng/tasks/setup-testjail.yml index c06ac16626..22130745ef 100644 --- a/tests/integration/targets/pkgng/tasks/setup-testjail.yml +++ b/tests/integration/targets/pkgng/tasks/setup-testjail.yml @@ -51,6 +51,10 @@ state: started enabled: yes +- name: Redirect logs depending on verbosity + set_fact: + pkgng_jail_log_redirect: "2>&1 | tee -a /tmp/ezjail.log {{ '> /dev/null' if ansible_verbosity < 2 else '' }}" + - name: Has ezjail register: ezjail_base_jail stat: @@ -58,7 +62,7 @@ - name: Setup ezjail base when: not ezjail_base_jail.stat.exists - shell: "ezjail-admin install >> /tmp/ezjail.log" + shell: "ezjail-admin install {{ pkgng_jail_log_redirect }}" changed_when: false - name: Has testjail @@ -68,7 +72,7 @@ - name: Create testjail when: not ezjail_test_jail.stat.exists - shell: "ezjail-admin create testjail 'lo1|127.0.1.1' >> /tmp/ezjail.log" + shell: "ezjail-admin create testjail 'lo1|127.0.1.1' {{ pkgng_jail_log_redirect }}" changed_when: false - name: Configure testjail to use Cloudflare DNS