From 77cf9ae061dd6fd97751c149a35b16931719c296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Tue, 16 Apr 2019 09:06:20 +0200 Subject: [PATCH] taskotron: fix duplicate jobs prevention In commit 111fc1805c1 I forgot to expand a variable. --- .../buildmaster-configure/templates/taskotron.master.cfg.j2 | 6 ++++-- 1 file changed, 4 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 7c00a50a8e..3c80561d44 100644 --- a/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 +++ b/roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2 @@ -287,7 +287,8 @@ factory.addStep(steps.MasterShellCommand( 'test -d {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s/ || ' '( echo Multiple jobs with same UUID detected, aborting execution!; ' ' echo See https://pagure.io/taskotron/issue/273 ; ' - ' exit 1 )' + ' exit 1 )', + today=today, ), descriptionDone='Check duplicate jobs', haltOnFailure=True, @@ -300,7 +301,8 @@ factory.addStep(steps.MasterShellCommand( 'mkdir -p -m 0755 {{ public_artifacts_dir }}/all && ' 'mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/ && ' 'ln -s {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s {{ public_artifacts_dir }}/all/', - today=today), + today=today, + ), descriptionDone='Move artifacs', ))