From d5cc71560bb1969c5b2805b65c5b37dd3a09567a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Thu, 18 Jan 2018 16:30:02 +0100 Subject: [PATCH] buildmaster-configure: fix gzipping artifacts Used to fail for symlinks. See https://pagure.io/taskotron/issue/247 --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 index cabe0cd97c..c052754869 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -240,7 +240,7 @@ factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron/artifac masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output'))) # gzip artifacts -factory.addStep(MasterShellCommand(command=Interpolate('gzip -r {{ public_artifacts_dir }}/%(prop:uuid)s/task_output/*'), +factory.addStep(MasterShellCommand(command=Interpolate('find {{ public_artifacts_dir }}/%(prop:uuid)s/task_output/ -type f -exec gzip {} \;'), descriptionDone=['gzip artifacs dir content'])) {% if deployment_type in ['local'] %} @@ -317,7 +317,7 @@ distgit_factory.addStep(DirectoryUpload(slavesrc=Interpolate('/var/lib/taskotron masterdest=Interpolate('{{ public_artifacts_dir }}/%(prop:uuid)s/task_output'))) # gzip artifacts -distgit_factory.addStep(MasterShellCommand(command=Interpolate('gzip -r {{ public_artifacts_dir }}/%(prop:uuid)s/task_output/*'), +distgit_factory.addStep(MasterShellCommand(command=Interpolate('find {{ public_artifacts_dir }}/%(prop:uuid)s/task_output/ -type f -exec gzip {} \;'), descriptionDone=['gzip artifacs dir content'])) {% endif %}