Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

F31 EOL

Browse source 
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2020-11-24 12:09:19 -05:00 • committed by mohanboddu
parent 08cfefbad1
commit 73dc8a1042
9 changed files with 6 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,50 +113,6 @@ RELEASES = {'f33': {'topic': 'fedora',
'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'],

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

@ -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:

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

@ -48,10 +48,6 @@ taglist = [
"f32-container",
"f32-modular",
"f32-flatpak",
"f31",
"f31-container",
"f31-flatpak",
"f31-modular",
"epel8",
"epel8-playground",
"epel8-modular",

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

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

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

@ -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

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

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

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

@ -7,5 +7,5 @@ MAILTO=releng-cron@lists.fedoraproject.org
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

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

@ -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

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

@ -92,30 +92,6 @@ handlers = ["console"]
# 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]]
@ -142,12 +118,6 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}"
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"
@ -169,18 +139,6 @@ handlers = ["console"]
# 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"
@ -297,19 +255,6 @@ handlers = ["console"]
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 @@ handlers = ["console"]
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"