diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 3ab4daac47..b8b300eadf 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -91,7 +91,7 @@ - python3-koji-cli-plugins - python2-koji - python3-fedfind # needed by clean-amis.py script - - python3-boto # needed by clean-amis.py script + - python3-boto3 # needed by clean-amis.py script - python3-requests # needed by clean-amis.py script - make - nosync @@ -99,11 +99,10 @@ tags: - releng -- name: add pkgs from testing repo +- name: add pkgs from infrastructure testing repo dnf: state=present pkg={{ item }} enablerepo=infrastructure-tags-stg with_items: - python3-libpagure - when: env == "staging" - name: add pkgs dnf: state=present pkg={{ item }} diff --git a/roles/releng/templates/clean-amis.j2 b/roles/releng/templates/clean-amis.j2 index e4044e44bd..040378b379 100644 --- a/roles/releng/templates/clean-amis.j2 +++ b/roles/releng/templates/clean-amis.j2 @@ -1,5 +1,5 @@ # Remove launch permissions from the AMIs after everyday -0 22 * * * root TMPDIR=`mktemp -d /tmp/purgeamis.XXXXXX` && pushd $TMPDIR && git clone -n 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 +0 22 * * * 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 }} PAGURE_ACCESS_TOKEN={{ ami_purge_report_api_key }} ./clean-amis.py --change-perms --days 7 --permswaitperiod 5 && popd && rm -rf $TMPDIR # Delete the AMIs after everyday -0 23 * * * root TMPDIR=`mktemp -d /tmp/purgeamis.XXXXXX` && pushd $TMPDIR && git clone -n 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 +0 23 * * * 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 }} PAGURE_ACCESS_TOKEN={{ ami_purge_report_api_key }} ./clean-amis.py --delete --days 17 --deletewaitperiod 10 && popd && rm -rf $TMPDIR