diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index fc7dc883b2..1fe634bf71 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -146,11 +146,6 @@ copy: src="docker-updates" dest=/etc/cron.d/docker-updates when: inventory_hostname.startswith('compose-x86-01') -# put cron job in for purging nightly amis -- name: purge nightly amis cron - template: src=purge-amis.j2 dest=/etc/cron.d/purge-amis - when: inventory_hostname.startswith('compose-x86-01') - - name: install compose /etc/httpd/conf.d/compose.conf file copy: > src="compose.conf" diff --git a/roles/releng/templates/purge-amis.j2 b/roles/releng/templates/purge-amis.j2 deleted file mode 100644 index a8ae092e51..0000000000 --- a/roles/releng/templates/purge-amis.j2 +++ /dev/null @@ -1,5 +0,0 @@ -# Remove launch permissions from the AMIs after every 5 days -0 0 */5 * * root 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 }}' ./clean-amis.py --change-perms && popd && rm -rf $TMPDIR - -# Delete the AMIs after every 10 days. -0 0 */10 * * root 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 }}' ./clean-amis.py --delete && popd && rm -rf $TMPDIR