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

Fedora 35 is End Of Life

Browse source 
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
This commit is contained in:
Tomas Hrcka 2022-12-13 14:32:23 +01:00
parent 016572ad54
commit 148cf4a47e
9 changed files with 7 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
roles/bodhi2/backend/tasks/main.yml
View file

@ -87,7 +87,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 f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular f35 f35-container f35-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'"
job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'"
cron_file=update-koji-owner
user=apache
when: env == "production"

4
roles/bodhi2/backend/templates/koji_sync_listener.toml
View file

@ -48,10 +48,6 @@ taglist = [
"f36-container",
"f36-modular",
"f36-flatpak",
"f35",
"f35-container",
"f35-modular",
"f35-flatpak",
"epel9",
"epel9-next",
"epel8",

1
roles/koji_hub/templates/hub.conf.j2
View file

@ -191,7 +191,6 @@ sidetag =
tag f38-build :: allow
tag f37-build :: allow
tag f36-build :: allow
tag f35-build :: allow
tag eln-build :: allow
tag epel9-next-build :: allow
tag epel9-build :: allow

28
roles/mbs/common/files/default-modules.production/platform-f35.yaml
View file

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

4
roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json
View file

@ -63,7 +63,7 @@
"dist_tag": ".fc35",
"koji_name": "f35",
"name": "Fedora Linux",
"status": "Active",
"status": "EOL",
"version": "35"
},
{
@ -74,7 +74,7 @@
"dist_tag": ".fc35",
"koji_name": "f35",
"name": "Fedora",
"status": "Active",
"status": "EOL",
"version": "35"
},
{

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

@ -7,5 +7,5 @@ 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
# Fedora 35 Cloud nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
15 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF35.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f35 && 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 7 * * * root TMPDIR=`mktemp -d /tmp/CloudF35.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f35 && LANG=en_US.UTF-8 ./cloud-nightly.sh RC-$(date "+\%Y\%m\%d").0 && popd && rm -rf $TMPDIR

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

@ -3,8 +3,8 @@ MAILTO=releng-cron@lists.fedoraproject.org
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 35 Container Updates nightly compose
MAILTO=releng-cron@lists.fedoraproject.org
45 6 * * * root TMPDIR=`mktemp -d /tmp/containerF35.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f35 && 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 6 * * * root TMPDIR=`mktemp -d /tmp/containerF35.XXXXXX` && chmod 755 $TMPDIR && pushd $TMPDIR && git clone -n https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f35 && 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

77
roles/robosignatory/templates/robosignatory.toml.j2
View file

@ -107,12 +107,6 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f35-infra-candidate"
to = "f35-infra-stg"
key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f36-infra-candidate"
to = "f36-infra-stg"
@ -142,12 +136,6 @@ handlers = ["console"]
# Gated coreos-pool tag
[[consumer_config.koji_instances.primary.tags]]
from = "f35-coreos-signing-pending"
to = "coreos-pool"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f36-coreos-signing-pending"
to = "coreos-pool"
@ -309,42 +297,6 @@ handlers = ["console"]
keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f35-signing-pending"
to = "f35-updates-testing-pending"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', '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 = 'f35-build-side-<seq_id>'
from = '<sidetag>-signing-pending'
to = '<sidetag>-testing-pending'
trusted_taggers = ['bodhi']
[[consumer_config.koji_instances.primary.tags]]
from = "f35-pending"
to = "f35"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f35-modular-pending"
to = "f35-modular"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f35-modular-signing-pending"
to = "f35-modular-updates-testing-pending"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
type = "modular"
#epel8 modular tags
[[consumer_config.koji_instances.primary.tags]]
from = "epel8-modular-signing-pending"
@ -473,35 +425,6 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f35-openh264"
to = "f35-openh264"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
# Side tags created by releng
# f35-python
[[consumer_config.koji_instances.primary.tags]]
from = "f35-python"
to = "f35-python"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
# f35-boost
[[consumer_config.koji_instances.primary.tags]]
from = "f35-boost"
to = "f35-boost"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
# f35-kde
[[consumer_config.koji_instances.primary.tags]]
from = "f35-kde"
to = "f35-kde"
key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}"
# f38 resigning
[[consumer_config.koji_instances.primary.tags]]
from = "f38"