From 4637e79ef90ed8d0b7dd0f04a51cca7a6927fa80 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Wed, 18 May 2016 07:42:11 +0000 Subject: [PATCH] taskotron-prod: use find for cleaning artifacts and logs --- roles/taskotron/taskotron-master/tasks/main.yml | 5 ----- .../taskotron-master/templates/taskotron-tmpwatch.cron.j2 | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2 diff --git a/roles/taskotron/taskotron-master/tasks/main.yml b/roles/taskotron/taskotron-master/tasks/main.yml index 7ed89205fd..842e1ed473 100644 --- a/roles/taskotron/taskotron-master/tasks/main.yml +++ b/roles/taskotron/taskotron-master/tasks/main.yml @@ -16,10 +16,5 @@ notify: - reload httpd -- name: copy tmpwatch cronjob for taskotron artifacts and buildmaster - template: src=taskotron-tmpwatch.cron.j2 dest=/etc/cron.d/taskotron-tmpwatch.cron owner=root group=root mode=0644 - when: deployment_type in ['prod', 'local'] - - name: copy cronjob for cleaning old taskotron artifacts and buildmaster logs template: src=taskotron-clean.cron.j2 dest=/etc/cron.d/taskotron-clean.cron owner=root group=root mode=0644 - when: deployment_type in ['dev', 'stg'] diff --git a/roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2 b/roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2 deleted file mode 100644 index 8e263ba457..0000000000 --- a/roles/taskotron/taskotron-master/templates/taskotron-tmpwatch.cron.j2 +++ /dev/null @@ -1,4 +0,0 @@ -0 0 * * * {{ buildmaster_user }} tmpwatch -vv --dirmtime -m -f {{ artifacts_max_life }} {{ public_artifacts_dir }} -10 0 * * * {{ buildmaster_user }} tmpwatch -vv --dirmtime -m -f {{ buildmaster_max_life }} {{ buildmaster_dir }}/x86_64 -20 0 * * * {{ buildmaster_user }} tmpwatch -vv --dirmtime -m -f {{ buildmaster_max_life }} {{ buildmaster_dir }}/i386 -30 0 * * * {{ buildmaster_user }} tmpwatch -vv --dirmtime -m -f {{ buildmaster_max_life }} {{ buildmaster_dir }}/all