PR#1440: Fedora 36 is End Of Life - fedora-infra/ansible

fedora-infra / ansible

#1440 Fedora 36 is End Of Life

Merged 21 days ago by humaton. Opened 21 days ago by jnsamyak.

fedora-infra/ jnsamyak/ansible f36-eol into main

[f36-eol] Make changes to robosignatory for 36 eol

Samyak Jain • 21 days ago

725150c

[f36-eol] Make changes to cron, bodhi, koji, mbs, pkgdb-proxy

Samyak Jain • 21 days ago

e77afa6

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

file modified

-50

		`@@ -132,56 +132,6 @@`
		`'dest': os.path.join(FEDORAALTDEST, 'testing', '37', 'Modular')}`
		`]}}`
		`},`
		`- 'f36': {'topic': 'fedora',`
		`- 'version': '36',`
		`- 'modules': ['fedora', 'fedora-secondary'],`
		`- 'repos': {'updates': {`
		`- 'from': 'f36-updates',`
		`- 'ostrees': [{'ref': 'fedora/36/%(arch)s/updates/silverblue',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']},`
		`- {'ref': 'fedora/36/%(arch)s/updates/kinoite',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']}],`
		`- 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, '36', 'Everything')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, '36', 'Everything')}`
		`- ]},`
		`- 'updates-testing': {`
		`- 'from': 'f36-updates-testing',`
		`- 'ostrees': [{'ref': 'fedora/36/%(arch)s/testing/silverblue',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']},`
		`- {'ref': 'fedora/36/%(arch)s/testing/kinoite',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']}],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, 'testing', '36', 'Everything')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Everything')}`
		`- ]}}`
		`- },`
		`- 'f36m': {'topic': 'fedora',`
		`- 'version': '36m',`
		`- 'modules': ['fedora', 'fedora-secondary'],`
		`- 'repos': {'updates': {`
		`- 'from': 'f36-modular-updates',`
		`- 'ostrees': [],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, '36', 'Modular')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, '36', 'Modular')}`
		`- ]},`
		`- 'updates-testing': {`
		`- 'from': 'f36-modular-updates-testing',`
		`- 'ostrees': [],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, 'testing', '36', 'Modular')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, 'testing', '36', 'Modular')}`
		`- ]}}`
		`- },`
		`'epel9': {'topic': 'epel',`
		`'version': '9',`
		`'modules': ['epel'],`

roles/bodhi2/backend/tasks/main.yml

file modified

+1 -1

		`@@ -104,7 +104,7 @@`
		`# bodhi2/backend/files/koji_sync_listener.py`
		`# This cronjob runs only once a day. The listener script runs reactively.`
		`cron: name="owner-sync" minute="15" hour="4" user="root"`
		`- job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f39 f39-container f39-modular f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'"`
		`+ job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f39 f39-container f39-modular f38 f38-container f38-modular f37 f37-container f37-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'"`
		`cron_file=update-koji-owner`
		`user=apache`
		`when: env == "production"`

roles/bodhi2/backend/templates/koji_sync_listener.toml

file modified

-4

		`@@ -48,10 +48,6 @@`
		`"f37-container",`
		`"f37-modular",`
		`"f37-flatpak",`
		`- "f36",`
		`- "f36-container",`
		`- "f36-modular",`
		`- "f36-flatpak",`
		`"epel9",`
		`"epel9-next",`
		`"epel8",`

roles/koji_hub/templates/hub.conf.j2

file modified

-1

		`@@ -194,7 +194,6 @@`
		`tag f39-build :: allow`
		`tag f38-build :: allow`
		`tag f37-build :: allow`
		`- tag f36-build :: allow`
		`tag eln-build :: allow`
		`tag epel9-next-build :: allow`
		`tag epel9-build :: allow`

roles/mbs/common/files/default-modules.production/platform-f36.yaml

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- data:`
		`- description: Fedora 36 traditional base`
		`- license:`
		`- module: [MIT]`
		`- name: platform`
		`- profiles:`
		`- buildroot:`
		`- rpms: [bash, bzip2, coreutils, cpio, diffutils, fedora-release, findutils, gawk,`
		`- glibc-minimal-langpack, grep, gzip, info, make, patch, redhat-rpm-config,`
		`- rpm-build, sed, shadow-utils, tar, unzip, util-linux, which, xz]`
		`- srpm-buildroot:`
		`- rpms: [bash, fedora-release, fedpkg-minimal, glibc-minimal-langpack, gnupg2,`
		`- redhat-rpm-config, rpm-build, shadow-utils]`
		`- stream: f36`
		`- summary: Fedora 36 traditional base`
		`- context: 00000000`
		`- version: 1`
		`- xmd:`
		`- mbs:`
		`- buildrequires: {}`
		`- commit: f36`
		`- requires: {}`
		`- koji_tag: module-f36-build`
		`- mse: TRUE`
		`- virtual_streams: [fedora]`
		`- document: modulemd`
		`- version: 1`
		`-`
		`\ No newline at end of file`

roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json

file modified

+2 -2

		`@@ -52,7 +52,7 @@`
		`"dist_tag": ".fc36",`
		`"koji_name": "f36",`
		`"name": "Fedora Linux",`
		`- "status": "Active",`
		`+ "status": "EOL",`
		`"version": "36"`
		`},`
		`{`
		`@@ -63,7 +63,7 @@`
		`"dist_tag": ".fc36",`
		`"koji_name": "f36",`
		`"name": "Fedora",`
		`- "status": "Active",`
		`+ "status": "EOL",`
		`"version": "36"`
		`},`
		`{`

roles/releng/files/cloud-updates

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

		`# Fedora 36 Cloud nightly compose`
		`- MAILTO=releng-cron@lists.fedoraproject.org`
		- 15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
		`+ # MAILTO=releng-cron@lists.fedoraproject.org`
		+ # 15 6 * * * root TMPDIR=`mktemp -d /tmp/CloudF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

roles/releng/files/container-updates

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF37.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f37 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

		`# Fedora 36 Container Updates nightly compose`
		`- MAILTO=releng-cron@lists.fedoraproject.org`
		- 45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR
		`+ # MAILTO=releng-cron@lists.fedoraproject.org`
		+ # 45 7 * * * root TMPDIR=`mktemp -d /tmp/containerF36.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f36 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

roles/robosignatory/templates/robosignatory.toml.j2

file modified

-61

		`@@ -114,12 +114,6 @@`
		`keyid = "{{ (env == 'production')\|ternary('47dd8ef9', 'd300e724') }}"`

		`[[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-infra-candidate"`
		`- to = "f36-infra-stg"`
		`- key = "{{ (env == 'production')\|ternary('fedora-infra', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('47dd8ef9', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`from = "f37-infra-candidate"`
		`to = "f37-infra-stg"`
		`key = "{{ (env == 'production')\|ternary('fedora-infra', 'testkey') }}"`
		`@@ -152,12 +146,6 @@`
		`# Gated coreos-pool tag`

		`[[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-coreos-signing-pending"`
		`- to = "coreos-pool"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`from = "f37-coreos-signing-pending"`
		`to = "coreos-pool"`
		`key = "{{ (env == 'production')\|ternary('fedora-37', 'testkey') }}"`
		`@@ -333,42 +321,6 @@`
		`file_signing_key = "fedora-37-ima"`
		`{% endif %}`

		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-signing-pending"`
		`- to = "f36-updates-testing-pending"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`- {% if env == "production" %}`
		`- # ima file signing - disable for now per fesco`
		`- # file_signing_key = "fedora-files-2021"`
		`- {% endif %}`
		`-`
		`- [consumer_config.koji_instances.primary.tags.sidetags]`
		`- pattern = 'f36-build-side-<seq_id>'`
		`- from = '<sidetag>-signing-pending'`
		`- to = '<sidetag>-testing-pending'`
		`- trusted_taggers = ['bodhi']`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-pending"`
		`- to = "f36"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-modular-pending"`
		`- to = "f36-modular"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`- type = "modular"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-modular-signing-pending"`
		`- to = "f36-modular-updates-testing-pending"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`- type = "modular"`
		`-`
		`# Gated bodhi updates`

		`[[consumer_config.koji_instances.primary.tags]]`
		`@@ -493,12 +445,6 @@`
		`file_signing_key = "fedora-37-ima"`
		`{% endif %}`

		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-openh264"`
		`- to = "f36-openh264"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`
		`-`
		`# f38 resigning`
		`[[consumer_config.koji_instances.primary.tags]]`
		`from = "f38"`
		`@@ -514,13 +460,6 @@`
		`key = "{{ (env == 'production')\|ternary('fedora-39', 'testkey') }}"`
		`keyid = "{{ (env == 'production')\|ternary('18B8e74c', 'd300e724') }}"`
		`file_signing_key = "fedora-39-ima"`
		`-`
		`- # f36-gnome`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f36-gnome"`
		`- to = "f36-gnome"`
		`- key = "{{ (env == 'production')\|ternary('fedora-36', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('38ab71f4', 'd300e724') }}"`

		`[consumer_config.ostree_refs]`
		`[consumer_config.ostree_refs."fedora/rawhide/x86_64/iot"]`