Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

releng: drop clean-ami's job

Browse source 
This job was used to cleanup old ami's from fedimg.
It then reported to a pagure project about what it did.
However, it's token has been expired and it no longer needs to exist.
Garbage collection of ami's should take place in the new
cloud-image-uploader (well, it marks when things are eol).
So, lets just remove this old and nolonger needed cron.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2024-12-05 14:05:47 -08:00
parent 0eeb127306
commit e26f6acacf
3 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

11
roles/releng/tasks/main.yml
View file

@ -233,9 +233,6 @@
- ostree
- python3-libmodulemd
- python3-koji-cli-plugins
- python3-fedfind # needed by clean-amis.py script
- python3-boto3 # needed by clean-amis.py script
- python3-requests # needed by clean-amis.py script
- make
- nosync
- python3-gobject
@ -330,14 +327,6 @@
mode: "644"
when: inventory_hostname.startswith('compose-x86-01.iad2')
# put cron job in for regular ami deletion
- name: Clean-amis cron
ansible.builtin.template:
src: clean-amis.j2
dest: /etc/cron.d/clean-amis
mode: "644"
when: inventory_hostname.startswith('compose-x86-01.iad2')
# put cron job in for IoT stable compose
- name: IoT stable compose cron
ansible.builtin.copy:

5
roles/releng/templates/clean-amis.j2
View file

@ -1,5 +0,0 @@
# Remove launch permissions from the AMIs after everyday
0 22 * * * root touch /tmp/fedora-compose-clean-amis && TMPDIR=`mktemp -d /tmp/purgeamis.XXXXXX` && pushd $TMPDIR && git clone https://pagure.io/releng.git && cd releng/scripts && AWS_ACCESS_KEY={{ ec2_image_delete_access_key_id }} AWS_SECRET_ACCESS_KEY={{ ec2_image_delete_access_key }} PAGURE_ACCESS_TOKEN={{ ami_purge_report_api_key }} ./clean-amis.py --change-perms --days 7 --permswaitperiod 5 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-clean-amis
# Delete the AMIs after everyday
0 23 * * * root touch /tmp/fedora-compose-clean-amis && TMPDIR=`mktemp -d /tmp/purgeamis.XXXXXX` && pushd $TMPDIR && git clone https://pagure.io/releng.git && cd releng/scripts && AWS_ACCESS_KEY={{ ec2_image_delete_access_key_id }} AWS_SECRET_ACCESS_KEY={{ ec2_image_delete_access_key }} PAGURE_ACCESS_TOKEN={{ ami_purge_report_api_key }} ./clean-amis.py --delete --days 17 --deletewaitperiod 10 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-clean-amis

2
roles/zabbix/zabbix_templates/files/releng_compose_cronjobs.json
View file

@ -1 +1 @@
{"zabbix_export": {"version": "6.0", "groups": [{"uuid": "7da5160d6c084729b45891e0d9a525b7", "name": "fedora releng compose"}], "templates": [{"uuid": "531f46e0cdf746fe912725a078e12906", "template": "releng_compose_cronjobs.json", "name": "fedora releng compose cronjobs", "groups": [{"name": "fedora releng compose"}], "items": [{"uuid": "15ac1ea981a24ad8a088ca5fb94d6823", "name": "branched compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-branched]", "history": "7d", "triggers": [{"uuid": "61cb60bf4da449b28bf829a13d59ba4d", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-branched])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-branched],8h)>0", "name": "branched cronjob stalled", "priority": "HIGH"}]}, {"uuid": "cfa6ce06960a4be1a000d8560b3e1658", "name": "clean-amis compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-clean-amis]", "history": "7d", "triggers": [{"uuid": "52c8525754c641828ac4c6c1078ee5c9", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-clean-amis])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-clean-amis],8h)>0", "name": "clean-amis cronjob stalled", "priority": "HIGH"}]}, {"uuid": "ee1849d8d93f49628ae11133a20d1df1", "name": "cloud-updates compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-cloud-updates]", "history": "7d", "triggers": [{"uuid": "260c4be3796d4baabcdd875762e5ff8e", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cloud-updates])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cloud-updates],8h)>0", "name": "cloud-updates cronjob stalled", "priority": "HIGH"}]}, {"uuid": "52a300297cef4360b37744d9fa0317e6", "name": "container-updates compose cronjobs stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-container-updates]", "history": "7d", "triggers": [{"uuid": "1956f365f8fe4dccbe2997f4abf37525", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-container-updates])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-container-updates],8h)>0", "name": "container-updates cronjob stalled", "priority": "HIGH"}]}, {"uuid": "7a48d07aabe64a2d90d21c4683f26273", "name": "ftbfs.cron compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron]", "history": "7d", "triggers": [{"uuid": "6005b333de1d4f798504a480102e9fe8", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron],8h)>0", "name": "ftbts.cron cronjob stalled", "priority": "HIGH"}]}, {"uuid": "664567affc5849aeae31eefb05708cdd", "name": "rawhide-iot compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-rawhide-iot]", "history": "7d", "triggers": [{"uuid": "8f1a97314c904e6baebcd1c84028b5e0", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide-iot])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide-iot],8h)>0", "name": "rawhide-iot cronjob stalled", "priority": "HIGH"}]}, {"uuid": "e2f7a76ff6db47edb54c536380e196ef", "name": "rawhide compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-rawhide]", "history": "7d", "triggers": [{"uuid": "65ae2d09344f4c49ae32683b27751994", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide],8h)>0", "name": "rawhide cronjob stalled", "priority": "HIGH"}]}, {"uuid": "1cf6d1bb895346e3b7fe109d2c37b75b", "name": "sig_policy compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-sig_policy]", "history": "7d", "triggers": [{"uuid": "8fcf1caf5197439592d9d3128fa29eaa", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-sig_policy])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-sig_policy],8h)>0", "name": "sig_policy cronjob stalled", "priority": "HIGH"}]}]}]}}
{"zabbix_export": {"version": "6.0", "groups": [{"uuid": "7da5160d6c084729b45891e0d9a525b7", "name": "fedora releng compose"}], "templates": [{"uuid": "531f46e0cdf746fe912725a078e12906", "template": "releng_compose_cronjobs.json", "name": "fedora releng compose cronjobs", "groups": [{"name": "fedora releng compose"}], "items": [{"uuid": "15ac1ea981a24ad8a088ca5fb94d6823", "name": "branched compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-branched]", "history": "7d", "triggers": [{"uuid": "61cb60bf4da449b28bf829a13d59ba4d", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-branched])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-branched],8h)>0", "name": "branched cronjob stalled", "priority": "HIGH"}]}, {"uuid": "ee1849d8d93f49628ae11133a20d1df1", "name": "cloud-updates compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-cloud-updates]", "history": "7d", "triggers": [{"uuid": "260c4be3796d4baabcdd875762e5ff8e", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cloud-updates])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cloud-updates],8h)>0", "name": "cloud-updates cronjob stalled", "priority": "HIGH"}]}, {"uuid": "52a300297cef4360b37744d9fa0317e6", "name": "container-updates compose cronjobs stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-container-updates]", "history": "7d", "triggers": [{"uuid": "1956f365f8fe4dccbe2997f4abf37525", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-container-updates])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-container-updates],8h)>0", "name": "container-updates cronjob stalled", "priority": "HIGH"}]}, {"uuid": "7a48d07aabe64a2d90d21c4683f26273", "name": "ftbfs.cron compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron]", "history": "7d", "triggers": [{"uuid": "6005b333de1d4f798504a480102e9fe8", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-cronjob-ftbts.cron],8h)>0", "name": "ftbts.cron cronjob stalled", "priority": "HIGH"}]}, {"uuid": "664567affc5849aeae31eefb05708cdd", "name": "rawhide-iot compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-rawhide-iot]", "history": "7d", "triggers": [{"uuid": "8f1a97314c904e6baebcd1c84028b5e0", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide-iot])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide-iot],8h)>0", "name": "rawhide-iot cronjob stalled", "priority": "HIGH"}]}, {"uuid": "e2f7a76ff6db47edb54c536380e196ef", "name": "rawhide compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-rawhide]", "history": "7d", "triggers": [{"uuid": "65ae2d09344f4c49ae32683b27751994", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-rawhide],8h)>0", "name": "rawhide cronjob stalled", "priority": "HIGH"}]}, {"uuid": "1cf6d1bb895346e3b7fe109d2c37b75b", "name": "sig_policy compose cronjob stalled", "type": "ZABBIX_ACTIVE", "key": "vfs.file.exists[/tmp/fedora-compose-sig_policy]", "history": "7d", "triggers": [{"uuid": "8fcf1caf5197439592d9d3128fa29eaa", "expression": "last(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-sig_policy])=1 and min(/releng_compose_cronjobs.json/vfs.file.exists[/tmp/fedora-compose-sig_policy],8h)>0", "name": "sig_policy cronjob stalled", "priority": "HIGH"}]}]}]}}