PR#320: F31 EOL - fedora-infra/ansible

fedora-infra / ansible

#320 F31 EOL

Merged 3 years ago by mohanboddu. Opened 3 years ago by mohanboddu.

fedora-infra/ mohanboddu/ansible f31-eol into master

F31 EOL

Mohan Boddu • 3 years ago

73dc8a1

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

file modified

-44

		`@@ -113,50 +113,6 @@`
		`'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Modular')}`
		`]}}`
		`},`
		`- 'f31': {'topic': 'fedora',`
		`- 'version': '31',`
		`- 'modules': ['fedora', 'fedora-secondary'],`
		`- 'repos': {'updates': {`
		`- 'from': 'f31-updates',`
		`- 'ostrees': [{'ref': 'fedora/31/%(arch)s/updates/silverblue',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']}],`
		`- 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, '31', 'Everything')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, '31', 'Everything')}`
		`- ]},`
		`- 'updates-testing': {`
		`- 'from': 'f31-updates-testing',`
		`- 'ostrees': [{'ref': 'fedora/31/%(arch)s/testing/silverblue',`
		`- 'dest': OSTREEDEST,`
		`- 'arches': ['x86_64', 'ppc64le', 'aarch64']}],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Everything')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Everything')}`
		`- ]}}`
		`- },`
		`- 'f31m': {'topic': 'fedora',`
		`- 'version': '31m',`
		`- 'modules': ['fedora', 'fedora-secondary'],`
		`- 'repos': {'updates': {`
		`- 'from': 'f31-modular-updates',`
		`- 'ostrees': [],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, '31', 'Modular')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, '31', 'Modular')}`
		`- ]},`
		`- 'updates-testing': {`
		`- 'from': 'f31-modular-updates-testing',`
		`- 'ostrees': [],`
		`- 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],`
		`- 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Modular')},`
		`- {'arches': ['ppc64le', 's390x'],`
		`- 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')}`
		`- ]}}`
		`- },`
		`'epel8': {'topic': 'epel',`
		`'version': '8',`
		`'modules': ['epel'],`

roles/bodhi2/backend/tasks/main.yml

file modified

+1 -1

		`@@ -76,7 +76,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 f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"`
		`+ job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f34 f34-container f34-modular f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"`
		`cron_file=update-koji-owner`
		`when: env == "production"`
		`tags:`

roles/bodhi2/backend/templates/koji_sync_listener.toml

file modified

-4

		`@@ -48,10 +48,6 @@`
		`"f32-container",`
		`"f32-modular",`
		`"f32-flatpak",`
		`- "f31",`
		`- "f31-container",`
		`- "f31-flatpak",`
		`- "f31-modular",`
		`"epel8",`
		`"epel8-playground",`
		`"epel8-modular",`

roles/koji_hub/templates/hub.conf.j2

file modified

-1

		`@@ -187,6 +187,5 @@`
		`tag f34-build :: allow`
		`tag f33-build :: allow`
		`tag f32-build :: allow`
		`- tag f31-build :: allow`
		`tag eln-build :: allow`
		`all :: deny`

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

file removed

-28

		`@@ -1,28 +0,0 @@`
		`- data:`
		`- description: Fedora 31 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: f31`
		`- summary: Fedora 31 traditional base`
		`- context: 00000000`
		`- version: 1`
		`- xmd:`
		`- mbs:`
		`- buildrequires: {}`
		`- commit: f31`
		`- requires: {}`
		`- koji_tag: module-f31-build`
		`- mse: TRUE`
		`- virtual_streams: [fedora]`
		`- document: modulemd`
		`- version: 1`
		`-`

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

file modified

+1 -1

		`@@ -41,7 +41,7 @@`
		`"dist_tag": ".fc31",`
		`"koji_name": "f31",`
		`"name": "Fedora",`
		`- "status": "Active",`
		`+ "status": "EOL",`
		`"version": "31"`
		`},`
		`{`

roles/releng/files/cloud-updates

file modified

+2 -2

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

		`# Fedora 31 Cloud nightly compose`
		`- MAILTO=releng-cron@lists.fedoraproject.org`
		- 15 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && 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 8 * * * root TMPDIR=`mktemp -d /tmp/CloudF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && 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

		`@@ -1,6 +1,6 @@`
		`#Fedora 31 Container Updates nightly compose`
		`- MAILTO=releng-cron@lists.fedoraproject.org`
		- 45 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && 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 5 * * * root TMPDIR=`mktemp -d /tmp/containerF31.XXXXXX` && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && LANG=en_US.UTF-8 ./container-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

		`# Fedora 33 Container Updates nightly compose`
		`MAILTO=releng-cron@lists.fedoraproject.org`

roles/robosignatory/templates/robosignatory.toml.j2

file modified

-61

		`@@ -92,30 +92,6 @@`

		`# Temporary tags`

		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-kde"`
		`- to = "f31-kde"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-gnome"`
		`- to = "f31-gnome"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-python"`
		`- to = "f31-python"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f30-kde"`
		`- to = "f30-kde"`
		`- key = "{{ (env == 'production')\|ternary('fedora-30', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('cfc659b9', 'd300e724') }}"`
		`-`
		`# Infra tags`

		`[[consumer_config.koji_instances.primary.tags]]`
		`@@ -143,12 +119,6 @@`
		`keyid = "{{ (env == 'production')\|ternary('47dd8ef9', 'd300e724') }}"`

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

		`[[consumer_config.koji_instances.primary.tags]]`
		`- from = "f30-coreos-signing-pending"`
		`- to = "coreos-pool"`
		`- key = "{{ (env == 'production')\|ternary('fedora-30', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('cfc659b9', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-coreos-signing-pending"`
		`- to = "coreos-pool"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`from = "f32-coreos-signing-pending"`
		`to = "coreos-pool"`
		`key = "{{ (env == 'production')\|ternary('fedora-32', 'testkey') }}"`
		`@@ -297,19 +255,6 @@`
		`keyid = "{{ (env == 'production')\|ternary('12c944d0', 'd300e724') }}"`
		`type = "modular"`

		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-signing-pending"`
		`- to = "f31-updates-testing-pending"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-modular-signing-pending"`
		`- to = "f31-modular-updates-testing-pending"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`- type = "modular"`
		`-`
		`#epel8 modular tags`
		`[[consumer_config.koji_instances.primary.tags]]`
		`from = "epel8-modular-signing-pending"`
		`@@ -417,12 +362,6 @@`
		`key = "{{ (env == 'production')\|ternary('fedora-32', 'testkey') }}"`
		`keyid = "{{ (env == 'production')\|ternary('12c944d0', 'd300e724') }}"`

		`- [[consumer_config.koji_instances.primary.tags]]`
		`- from = "f31-openh264"`
		`- to = "f31-openh264"`
		`- key = "{{ (env == 'production')\|ternary('fedora-31', 'testkey') }}"`
		`- keyid = "{{ (env == 'production')\|ternary('3c3359c4', 'd300e724') }}"`
		`-`
		`# f33-rebuild`
		`[[consumer_config.koji_instances.primary.tags]]`
		`from = "f33-rebuild"`