diff --git a/roles/koji_builder/files/osbuildapi-update.cron b/roles/koji_builder/files/osbuildapi-update.cron deleted file mode 100644 index e352405041..0000000000 --- a/roles/koji_builder/files/osbuildapi-update.cron +++ /dev/null @@ -1 +0,0 @@ -* * * * * root /usr/local/bin/lock-wrapper osbuildapi "/usr/local/bin/osbuildapi-update.sh" 2>&1 | /usr/local/bin/nag-once osbuildapi-update.sh 1d 2>&1 diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index d8498ec363..9800f62ede 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -366,7 +366,7 @@ - koji_builder/osbuildapi - name: install cron job to run osbuild api ip update script every minute. - copy: src=osbuildapi-update.cron dest=/etc/cron.d/osbuildapi-update.cron mode=644 + template: src=osbuildapi-update.cron dest=/etc/cron.d/osbuildapi-update.cron mode=644 tags: - koji_builder - koji_builder/osbuildapi diff --git a/roles/koji_builder/templates/osbuildapi-update.cron b/roles/koji_builder/templates/osbuildapi-update.cron new file mode 100644 index 0000000000..9872862d63 --- /dev/null +++ b/roles/koji_builder/templates/osbuildapi-update.cron @@ -0,0 +1,5 @@ +{% if inventory_hostname.startswith('buildhw-x86') } +*/5 * * * * root /usr/local/bin/lock-wrapper osbuildapi "/usr/local/bin/osbuildapi-update.sh" 2>&1 | /usr/local/bin/nag-once osbuildapi-update.sh 1d 2>&1 +{% else } +23 17 * * * root /usr/local/bin/lock-wrapper osbuildapi "/usr/local/bin/osbuildapi-update.sh" 2>&1 | /usr/local/bin/nag-once osbuildapi-update.sh 1d 2>&1 +{% endif %} diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index ad034a5940..96a9ca78da 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -119,6 +119,7 @@ tag = all :: allow channel = + method osbuildImage :: use osbuild method newRepo distRepo buildSRPMFromSCM :: use createrepo method buildContainer :: use container has req_channel && has_perm customchannel :: req