PR#2230: releng / bodhi: switch epel10 compose to nightly cron job - fedora-infra/ansible

fedora-infra / ansible

#2230 releng / bodhi: switch epel10 compose to nightly cron job

Merged 9 days ago by kevin. Opened 19 days ago by carlwgeorge.

fedora-infra/ carlwgeorge/ansible epel10_no_bodhi_compose_yet into main

releng / bodhi: switch epel10 compose to nightly cron job

Carl George • 10 days ago

566769d

roles/bodhi2/backend/files/new-updates-sync

file modified

-14

		`@@ -152,20 +152,6 @@`
		`'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'],`

roles/bodhi2/base/templates/production.ini.j2

file modified

-3

		`@@ -249,9 +249,6 @@`
		`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 %}`

roles/releng/files/epel10

file added

		`@@ -0,0 +1,3 @@`
		`+ # 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

roles/releng/tasks/main.yml

file modified

		`@@ -218,6 +218,11 @@`
		`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`

carlwgeorge commented 19 days ago

https://pagure.io/releng/issue/12256

zuul commented 19 days ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/a789abe29f4d4b569b5bc38b8facb28f

fi-ansible-lint-diff : SUCCESS in 4m 11s
fi-yamllint-diff : SUCCESS in 2m 35s

kevin commented 18 days ago

This looks good to me, but lets perhaps merge the other bits and manually run a compose first? If thats all good, then merge this and start doing them automatically.

carlwgeorge commented 18 days ago

Sounds like a plan.

jnsamyak commented 12 days ago

rebased onto 01aa61f

10 days ago

carlwgeorge commented 10 days ago

The pungi bits have been tested and are ready to merge, then this one can be merged. Once merged and applied in production, we can turn off composed-by-bodhi on the EPEL-10.0 bodhi release.

zuul commented 10 days ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/f4500010f9ef4e6abc838e49e5d0bb67

fi-ansible-lint-diff : SUCCESS in 3m 59s
fi-yamllint-diff : SUCCESS in 2m 42s

rebased onto 01aa61f

10 days ago

zuul commented 10 days ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/50a6466504bb498d9be696e72f1f2407

fi-ansible-lint-diff : SUCCESS in 3m 53s
fi-yamllint-diff : SUCCESS in 2m 16s

kevin commented 9 days ago

So, if we want to remove that stuff from bodhi this would need a freeze break.

Perhaps we just drop that for now and clean it up/adjust it after freeze?

carlwgeorge commented 9 days ago

I think we need to keep the bodhi adjustments to ensure that the existing compose stuff doesn't try to overwrite the new compose stuff, so I've submitted a freeze break request.

https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedoraproject.org/thread/5XGFEZ5BCZOCG44J363YXNEP6BMZPKCX/

kevin commented 9 days ago

Yeah, you're right. ;)