From 25774406c3aaab9db955d0e8d40806cc6a653f46 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 12 May 2016 08:43:34 +0000 Subject: [PATCH] taskotron-master: try using tmpfiles.d for cleaning dirs --- roles/taskotron/taskotron-master/tasks/main.yml | 5 +++++ .../templates/tmpfiles.d.buildmaster.conf.j2 | 4 ++++ roles/taskotron/taskotron-trigger/tasks/main.yml | 8 ++------ .../templates/tmpfiles.d.trigger.conf.j2 | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 roles/taskotron/taskotron-master/templates/tmpfiles.d.buildmaster.conf.j2 create mode 100644 roles/taskotron/taskotron-trigger/templates/tmpfiles.d.trigger.conf.j2 diff --git a/roles/taskotron/taskotron-master/tasks/main.yml b/roles/taskotron/taskotron-master/tasks/main.yml index 6ea713129f..55766dde33 100644 --- a/roles/taskotron/taskotron-master/tasks/main.yml +++ b/roles/taskotron/taskotron-master/tasks/main.yml @@ -18,3 +18,8 @@ - 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 ['stg', 'prod', 'local'] + +- name: copy tmpfiles.d for artifacts and buildmaster + template: src=tmpfiles.d.buildmaster.conf.j2 dest=/etc/tmpfiles.d/buildmaster.conf owner=root group=root mode=0644 + when: deployment_type in ['dev'] diff --git a/roles/taskotron/taskotron-master/templates/tmpfiles.d.buildmaster.conf.j2 b/roles/taskotron/taskotron-master/templates/tmpfiles.d.buildmaster.conf.j2 new file mode 100644 index 0000000000..e588b17a33 --- /dev/null +++ b/roles/taskotron/taskotron-master/templates/tmpfiles.d.buildmaster.conf.j2 @@ -0,0 +1,4 @@ +d /srv/taskotron/artifacts 0775 buildmaster buildmaster 120d +d /srv/buildmaster/master/x86_64 0700 buildmaster buildmaster 120d +d /srv/buildmaster/master/i386 0700 buildmaster buildmaster 120d +d /srv/buildmaster/master/all 0700 buildmaster buildmaster 120d diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml index 4f0fb9e478..3489c0c1da 100644 --- a/roles/taskotron/taskotron-trigger/tasks/main.yml +++ b/roles/taskotron/taskotron-trigger/tasks/main.yml @@ -52,12 +52,8 @@ job="wget -O {{ trigger_critpath_file }} {{ trigger_critpath_url }}" when: deployment_type in ['dev'] -- name: create a cronjob to clear distgit cache - cron: - name="clear distgit cache" - special_time=daily - user=fedmsg - job="tmpwatch -vv --dirmtime -m -f 12h {{ trigger_cache_dir }}" +- name: copy tmpfiles.d for trigger distgit cache + template: src=tmpfiles.d.trigger.conf.j2 dest=/etc/tmpfiles.d/trigger.conf owner=root group=root mode=0644 when: deployment_type in ['dev'] - name: start and enable fedmsg-hub service diff --git a/roles/taskotron/taskotron-trigger/templates/tmpfiles.d.trigger.conf.j2 b/roles/taskotron/taskotron-trigger/templates/tmpfiles.d.trigger.conf.j2 new file mode 100644 index 0000000000..1c33677bb2 --- /dev/null +++ b/roles/taskotron/taskotron-trigger/templates/tmpfiles.d.trigger.conf.j2 @@ -0,0 +1 @@ +d /var/lib/taskotron-trigger/cache 0755 fedmsg fedmsg 12h