infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

Revert "releng / bodhi: switch epel10 compose to nightly cron job"

Browse source 
This reverts commit 566769ded7.

We need to revert this in order to push updates that are pending testing
and stable, then will switch it back.
This commit is contained in:
Kevin Fenzi 2024-09-06 13:42:30 -07:00
parent 566769ded7
commit cbdabd149e
4 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roles/bodhi2/backend/files/new-updates-sync
View file

@ -152,6 +152,20 @@ RELEASES = {'f41': {'topic': 'fedora',
'dest': os.path.join(FEDORAALTDEST, 'testing', '39', 'Everything')}
]}}
},
'epel10.0': {'topic': 'epel',
'version': '10.0',
'modules': ['epel'],
'repos': {'epel': {
'from': 'epel10.0',
'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
'dest': os.path.join(EPELDEST, '10', 'Everything')}
]},
'epel-testing': {
'from': 'epel10.0-testing',
'to': [{'arches': ['x86_64', 'aarch64', 'ppc64le', 's390x', 'source'],
'dest': os.path.join(EPELDEST, 'testing', '10', 'Everything')}
]}}
},
'epel9': {'topic': 'epel',
'version': '9',
'modules': ['epel'],

3
roles/bodhi2/base/templates/production.ini.j2
View file

@ -249,6 +249,9 @@ fedora_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/upd
fedora_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
fedora_epel_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/%%s/%%s/repodata/repomd.xml
fedora_epel_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/%%s/%%s/repodata/repomd.xml
# the latest EPEL 10 minor version needs an override to use 10 in the path instead of 10.x
fedora_epel_10.0_stable_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/10/Everything/%%s/repodata/repomd.xml
fedora_epel_10.0_testing_master_repomd = http://dl-iad05.fedoraproject.org/pub/epel/testing/10/Everything/%%s/repodata/repomd.xml
fedora_modular_stable_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates/compose/Everything/%%s/os/repodata/repomd.xml
fedora_modular_testing_master_repomd = https://kojipkgs.stg.fedoraproject.org/compose/updates/f%%s-modular-updates-testing/compose/Everything/%%s/os/repodata/repomd.xml
{% endif %}

3
roles/releng/files/epel10
View file

@ -1,3 +0,0 @@
# epel10 compose
MAILTO=releng-cron@lists.fedoraproject.org
15 3 * * * root touch /tmp/fedora-compose-epel10 && TMPDIR=`mktemp -d /tmp/epel10.XXXXXX` && chmod 755 $TMPDIR && cd $TMPDIR && git clone --depth 1 --branch epel10 https://pagure.io/pungi-fedora.git && cd pungi-fedora && /usr/local/bin/lock-wrapper epel10-compose "LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub epel && rm /tmp/fedora-compose-epel10

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

@ -218,11 +218,6 @@
copy: src="rawhide-iot" dest=/etc/cron.d/rawhide-iot
when: inventory_hostname.startswith('compose-iot-01.iad2')
# put cron job in for epel10 compose
- name: epel10 compose cron
copy: src="epel10" dest=/etc/cron.d/epel10
when: inventory_hostname.startswith('compose-rawhide01.iad2')
# put cron job in for enforcing FESCo SIG Policy
# https://docs.fedoraproject.org/en-US/fesco/SIG_policy/
- name: sig_policy cron