From 37a6aea3cf6810b58b071c8cd99f688330508729 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 13 Jun 2020 20:25:56 -0700 Subject: [PATCH] koji_hub: add lockfile location to cron Signed-off-by: Kevin Fenzi --- playbooks/groups/releng-compose.yml | 28 ++++++++++++++-------------- roles/koji_hub/files/koji-gc | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index ed4e94b54a..17d18c2448 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -135,20 +135,20 @@ key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key", when: env == "production" } - #- { - # role: login-registry, - # candidate_registry: "candidate-registry.stg.fedoraproject.org", - # candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}", - # candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}", - # when: env == "staging" - #} - #- { - # role: login-registry, - # candidate_registry: "candidate-registry.fedoraproject.org", - # candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}", - # candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}", - # when: env == "production" - #} + - { + role: login-registry, + candidate_registry: "candidate-registry.stg.fedoraproject.org", + candidate_registry_osbs_username: "{{candidate_registry_osbs_stg_username}}", + candidate_registry_osbs_password: "{{candidate_registry_osbs_stg_password}}", + when: env == "staging" + } + - { + role: login-registry, + candidate_registry: "candidate-registry.fedoraproject.org", + candidate_registry_osbs_username: "{{candidate_registry_osbs_prod_username}}", + candidate_registry_osbs_password: "{{candidate_registry_osbs_prod_password}}", + when: env == "production" + } - { role: login-registry, candidate_registry: "quay.io", diff --git a/roles/koji_hub/files/koji-gc b/roles/koji_hub/files/koji-gc index 6ad61762da..4bb323bbd2 100644 --- a/roles/koji_hub/files/koji-gc +++ b/roles/koji_hub/files/koji-gc @@ -1,6 +1,6 @@ # Run garbage collector nightly SCRIPT=/usr/sbin/koji-gc MAILTO=releng-cron@lists.fedoraproject.org -0 8 * * * apache /usr/local/bin/lock-wrapper koji-gc-delete $SCRIPT --action=delete -0 10 * * * apache /usr/local/bin/lock-wrapper koji-gc-prune $SCRIPT --action=prune -0 9 * * * apache /usr/local/bin/lock-wrapper koji-gc-trash $SCRIPT --action=trash +0 8 * * * apache /usr/local/bin/lock-wrapper koji-gc-delete $SCRIPT --action=delete --lock-file /var/tmp/koji-gc.lock +0 10 * * * apache /usr/local/bin/lock-wrapper koji-gc-prune $SCRIPT --action=prune --lock-file /var/tmp/koji-gc.lock +0 9 * * * apache /usr/local/bin/lock-wrapper koji-gc-trash $SCRIPT --action=trash --lock-file /var/tmp/koji-gc.lock