Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

taskotron: fix duplicate jobs prevention

Browse source 
In commit 111fc1805c I forgot to expand a variable.
This commit is contained in:
Kamil Páral 2019-04-16 09:06:20 +02:00
parent c8de1af1d1
commit 77cf9ae061
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/taskotron/buildmaster-configure/templates/taskotron.master.cfg.j2
View file

@ -287,7 +287,8 @@ factory.addStep(steps.MasterShellCommand(
'test -d {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s/ || ' 'test -d {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s/ || '
'( echo Multiple jobs with same UUID detected, aborting execution!; ' '( echo Multiple jobs with same UUID detected, aborting execution!; '
' echo See https://pagure.io/taskotron/issue/273 ; ' ' echo See https://pagure.io/taskotron/issue/273 ; '
' exit 1 )' ' exit 1 )',
today=today,
), ),
descriptionDone='Check duplicate jobs', descriptionDone='Check duplicate jobs',
haltOnFailure=True, haltOnFailure=True,
@ -300,7 +301,8 @@ factory.addStep(steps.MasterShellCommand(
'mkdir -p -m 0755 {{ public_artifacts_dir }}/all && ' 'mkdir -p -m 0755 {{ public_artifacts_dir }}/all && '
'mv {{ public_artifacts_dir }}/%(prop:uuid)s/ {{ public_artifacts_dir }}/%(kw:today)s/ && ' '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/', 'ln -s {{ public_artifacts_dir }}/%(kw:today)s/%(prop:uuid)s {{ public_artifacts_dir }}/all/',
today=today), today=today,
),
descriptionDone='Move artifacs', descriptionDone='Move artifacs',
)) ))