From f9508750d1166a7e6978f6d2cef5b5fa795a6e5e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 19 Jun 2019 21:51:37 +0000 Subject: [PATCH] koji_hub / prunesigned: Since we keep more than latest in infra tags anymore, protect those from pruning the signed rpm copies Signed-off-by: Kevin Fenzi --- roles/koji_hub/files/koji-prunesigs | 2 +- roles/koji_hub/tasks/main.yml | 5 +++++ .../prune-signed-copies-protected-tags.j2 | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 roles/koji_hub/templates/prune-signed-copies-protected-tags.j2 diff --git a/roles/koji_hub/files/koji-prunesigs b/roles/koji_hub/files/koji-prunesigs index 416b27659a..3781860232 100644 --- a/roles/koji_hub/files/koji-prunesigs +++ b/roles/koji_hub/files/koji-prunesigs @@ -1,4 +1,4 @@ # Run prune-signed-copies nightly MAILTO=releng-cron@lists.fedoraproject.org SCRIPT=/usr/bin/koji -0 8 * * * apache /usr/local/bin/lock-wrapper koji-prune-signed $SCRIPT --noauth prune-signed-copies --verbose +0 8 * * * apache /usr/local/bin/lock-wrapper koji-prune-signed $SCRIPT --noauth prune-signed-copies --verbose --protect-tag-file=/etc/prune-signed-copies-protected-tags diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 4c582bfde2..4f1626f6b5 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -399,6 +399,11 @@ tags: - koji_hub +- name: install prune-signed-copies-protected-tags config for prunesigs + template: src=prune-signed-copies-protected-tags.j2 dest=/etc/prune-signed-copies-protected-tags + tags: + - koji_hub + - name: install cron jobs to be used by keepalived later copy: src={{ item }} dest=/usr/local/etc/{{ item }} with_items: diff --git a/roles/koji_hub/templates/prune-signed-copies-protected-tags.j2 b/roles/koji_hub/templates/prune-signed-copies-protected-tags.j2 new file mode 100644 index 0000000000..a9aba77012 --- /dev/null +++ b/roles/koji_hub/templates/prune-signed-copies-protected-tags.j2 @@ -0,0 +1,16 @@ +f{{ FedoraRawhideNumber }}-infra +f{{ FedoraRawhideNumber }}-infra-stg +{% if FedoraBranchedBodhi is defined %} +f{{ FedoraBranchedNumber}}-infra +f{{ FedoraBranchedNumber}}-infra-stg +{% endif %} +f{{ FedoraCycleNumber }}-infra +f{{ FedoraCycleNumber }}-infra-stg +f{{ FedoraPreviousCycleNumber }}-infra +f{{ FedoraPreviousCycleNumber }}-infra-stg +{% if FedoraPreviousPrevious is defined %} +f{{ FedoraPreviousPreviousCycleNumber }}-infra +f{{ FedoraPreviousPreviousCycleNumber }}-infra-stg +{% endif %} +epel7-infra +epel7-infra-stg