From ddc1e9c7d25bceb98be8ac32b942c0ff98a1aa98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Wed, 29 May 2019 15:59:08 +0200
Subject: [PATCH] taskotron: install imagefactory-client cron jobs into
 /etc/cron.d

---
 .../imagefactory-client/tasks/main.yml          | 17 +++++++----------
 .../templates/imagefactory-client.cron.j2       |  5 +++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 roles/taskotron/imagefactory-client/templates/imagefactory-client.cron.j2

diff --git a/roles/taskotron/imagefactory-client/tasks/main.yml b/roles/taskotron/imagefactory-client/tasks/main.yml
index e75136b55b..b392bf9ce3 100644
--- a/roles/taskotron/imagefactory-client/tasks/main.yml
+++ b/roles/taskotron/imagefactory-client/tasks/main.yml
@@ -34,13 +34,10 @@
 - name: Download/update images
   command: '/var/lib/fedoraqa/base_images/process_for_taskotron.py --taskotrondir {{imagesdir}}'
 
-- name: Create cronjob to download new images
-  cron:
-    name: "Download new images from ImageFactory"
-    special_time: hourly
-    job: '/var/lib/fedoraqa/base_images/process_for_taskotron.py --taskotrondir {{imagesdir}} > /dev/null'
-- name: Create cronjob to prune old images
-  cron:
-    name: "Clean up images downloaded from ImageFactory"
-    special_time: daily
-    job: '/var/lib/fedoraqa/base_images/prune_images/prune_images.py directory --keep 3 {{imagesdir}} > /dev/null'
+- name: Install cron job to download new ImageFactory images and clean up old ones
+  template:
+    src: imagefactory-client.cron.j2
+    dest: /etc/cron.d/imagefactory-client.cron
+    owner: root
+    group: root
+    mode: 0644
diff --git a/roles/taskotron/imagefactory-client/templates/imagefactory-client.cron.j2 b/roles/taskotron/imagefactory-client/templates/imagefactory-client.cron.j2
new file mode 100644
index 0000000000..121de28e7b
--- /dev/null
+++ b/roles/taskotron/imagefactory-client/templates/imagefactory-client.cron.j2
@@ -0,0 +1,5 @@
+# Download new images from ImageFactory
+@hourly root /var/lib/fedoraqa/base_images/process_for_taskotron.py --taskotrondir {{imagesdir}} > /dev/null
+
+# Clean up images downloaded from ImageFactory
+@daily root /var/lib/fedoraqa/base_images/prune_images/prune_images.py directory --keep 3 {{imagesdir}} > /dev/null