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

Make the stable nightly compose crons into templates

Browse source 
This means we don't need to manually update the release numbers
at stable release and EOL times any more, only make sure the
relevant playbook is run.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-11-27 09:31:21 -08:00
parent 804b7558dd
commit 71c9eab3d0
6 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
playbooks/groups/releng-compose.yml
View file

@ -17,6 +17,11 @@
vars_files:
- /srv/web/infra/ansible/vars/global.yml
- "/srv/web/infra/ansible/vars/all/00-FedoraCycleNumber.yaml"
- "/srv/web/infra/ansible/vars/all/FedoraPreviousCycleNumber.yaml"
- "/srv/web/infra/ansible/vars/all/FedoraPreviousPrevious.yaml"
- "/srv/web/infra/ansible/vars/all/FedoraPreviousPreviousCycleNumber.yaml"
- "/srv/private/ansible/vars.yml"
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml

11
roles/releng/files/cloud-updates
View file

@ -1,11 +0,0 @@
# Fedora 41 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
# Fedora 40 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
# Fedora 39 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 6 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates

11
roles/releng/files/container-updates
View file

@ -1,11 +0,0 @@
# Fedora 41 Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF41.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f41 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
#Fedora 40 Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF40.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f40 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
# Fedora 39 Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 7 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF39.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f39 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates

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

@ -316,16 +316,16 @@
# put cron job in for cloud nightly compose
- name: Cloud updates compose cron
ansible.builtin.copy:
src: cloud-updates
ansible.builtin.template:
src: cloud-updates.j2
dest: /etc/cron.d/cloud-updates
mode: "644"
when: inventory_hostname.startswith('compose-x86-01.iad2')
# put cron job in for docker nightly compose
- name: Docker compose cron
ansible.builtin.copy:
src: container-updates
ansible.builtin.template:
src: container-updates.j2
dest: /etc/cron.d/container-updates
mode: "644"
when: inventory_hostname.startswith('compose-x86-01.iad2')

13
roles/releng/templates/cloud-updates.j2 Normal file
View file

@ -0,0 +1,13 @@
# Fedora {{ FedoraCycleNumber }} Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 7 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
# Fedora {{ FedoraPreviousCycleNumber }} Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
{% if FedoraPreviousPrevious %}
# Fedora {{ FedoraPreviousPreviousCycleNumber }} Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 6 * * * root touch /tmp/fedora-compose-cloud-updates && TMPDIR=`mktemp -d /tmp/CloudF{{ FedoraPreviousPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousPreviousCycleNumber }} && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-cloud-updates
{% endif %}

13
roles/releng/templates/container-updates.j2 Normal file
View file

@ -0,0 +1,13 @@
# Fedora {{ FedoraCycleNumber }} Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 6 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF{{ FedoraCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
#Fedora {{ FedoraPreviousCycleNumber }} Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF{{ FedoraPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
{% if FedoraPreviousPrevious %}
# Fedora {{ FedoraPreviousPreviousCycleNumber }} Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 7 * * * root touch /tmp/fedora-compose-container-updates && TMPDIR=`mktemp -d /tmp/containerF{{ FedoraPreviousPreviousCycleNumber }}.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f{{ FedoraPreviousPreviousCycleNumber }} && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR && rm /tmp/fedora-compose-container-updates
{% endif %}