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

Branching F32 from rawhide

Browse source 
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2020-02-11 19:54:39 +00:00 • committed by Pierre-Yves Chibon
parent 85407ea90a
commit fdf52dca0a
11 changed files with 168 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
roles/bodhi2/backend/files/koji-sync-listener.py
View file

@ -23,7 +23,7 @@ def handle(content):
sys.stdout.flush()
# XXX If you modify this taglist. Please also modify the other copy in
# bodhi2/backend/tasks/main.yml
taglist = 'f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'
taglist = 'f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'
cmd = [
'/usr/local/bin/owner-sync-pagure',
'--package', package,

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

@ -20,7 +20,51 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/'
EPELDEST = '/pub/epel/'
OSTREESOURCE = '/mnt/koji/compose/ostree/repo/'
OSTREEDEST = '/mnt/koji/ostree/repo/'
RELEASES = {'f31': {'topic': 'fedora',
RELEASES = {'f32': {'topic': 'fedora',
'version': '32',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f32-updates',
'ostrees': [{'ref': 'fedora/32/%(arch)s/updates/silverblue',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}],
'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'],
'dest': os.path.join(FEDORADEST, '32', 'Everything')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '32', 'Everything')}
]},
'updates-testing': {
'from': 'f32-updates-testing',
'ostrees': [{'ref': 'fedora/32/%(arch)s/testing/silverblue',
'dest': OSTREEDEST,
'arches': ['x86_64', 'ppc64le', 'aarch64']}],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '32', 'Everything')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Everything')}
]}}
},
'f32m': {'topic': 'fedora',
'version': '32m',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {
'from': 'f32-modular-updates',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, '32', 'Modular')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, '32', 'Modular')}
]},
'updates-testing': {
'from': 'f32-modular-updates-testing',
'ostrees': [],
'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'],
'dest': os.path.join(FEDORADEST, 'testing', '32', 'Modular')},
{'arches': ['ppc64le', 's390x'],
'dest': os.path.join(FEDORAALTDEST, 'testing', '32', 'Modular')}
]}}
},
'f31': {'topic': 'fedora',
'version': '31',
'modules': ['fedora', 'fedora-secondary'],
'repos': {'updates': {

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

@ -73,7 +73,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 f32 f32-container f32-modular f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-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 f33 f33-container f33-modular f33-flatpak f32 f32-container f32-modular f32-flatpak f31 f31-container f31-flatpak f31-modular f30 f30-container f30-flatpak f30-modular epel8 epel8-playground epel8-modular epel7 dist-6E-epel module-package-list modular'"
cron_file=update-koji-owner
when: env == "production"
tags:

2
roles/bodhi2/backend/templates/pungi.module.conf.j2
View file

@ -16,6 +16,8 @@ sigkeys = [
'cfc659b9',
[% elif release.version_int == 31 %]
'3c3359c4',
[% elif release.version_int == 32 %]
'12c944d0',
[% elif release.version_int == 8 %]
'2f86d6a1',
[% endif %]

2
roles/bodhi2/backend/templates/pungi.rpm.conf.j2
View file

@ -31,6 +31,8 @@ sigkeys = [
'3c3359c4',
[% elif release.version_int == 32 %]
'12c944d0',
[% elif release.version_int == 33 %]
'9570ff31',
[% elif release.version_int == 6 %]
'0608b895',
[% elif release.version_int == 7 %]

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

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

6
roles/packages3/web/files/distmappings.py
View file

@ -1,5 +1,9 @@
# Global list of koji tags we care about
tags = ({'name': 'Rawhide', 'tag': 'f32'},
tags = ({'name': 'Rawhide', 'tag': 'f33'},
{'name': 'Fedora 32', 'tag': 'f32-updates'},
{'name': 'Fedora 32', 'tag': 'f32'},
{'name': 'Fedora 32 Testing', 'tag': 'f32-updates-testing'},
{'name': 'Fedora 31', 'tag': 'f31-updates'},
{'name': 'Fedora 31', 'tag': 'f31'},

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

@ -4,13 +4,24 @@
"allow_retire": true,
"branchname": "master",
"date_created": "2014-05-14 12:36:15",
"date_updated": "2019-08-14 17:07:23",
"dist_tag": ".fc32",
"date_updated": "2020-02-11 17:07:23",
"dist_tag": ".fc33",
"koji_name": "rawhide",
"name": "Fedora",
"status": "Under Development",
"version": "devel"
},
{
"allow_retire": false,
"branchname": "f32",
"date_created": "2014-05-14 12:36:15",
"date_updated": "2020-02-11 17:07:23",
"dist_tag": ".fc32",
"koji_name": "f32",
"name": "Fedora",
"status": "Active",
"version": "32"
},
{
"allow_retire": false,
"branchname": "f31",

2
roles/releng/files/branched
View file

@ -1,3 +1,3 @@
# branched compose
#MAILTO=releng-cron@lists.fedoraproject.org
#15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f31 && /usr/local/bin/lock-wrapper branched-compose "PYTHONMALLOC=debug LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary
15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f32 && /usr/local/bin/lock-wrapper branched-compose "PYTHONMALLOC=debug LANG=en_US.UTF-8 ./nightly.sh" && sudo -u ftpsync /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary

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

@ -216,8 +216,46 @@ handlers = ["console"]
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f33-coreos-signing-pending"
to = "coreos-pool"
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('9570ff31', 'd300e724') }}"
# Gated rawhide and branched
[[consumer_config.koji_instances.primary.tags]]
from = "f33-signing-pending"
to = "f33-updates-testing-pending"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[consumer_config.koji_instances.primary.tags.sidetags]
pattern = 'f33-build-side-<seq_id>'
from = '<sidetag>-signing-pending'
to = '<sidetag>-testing-pending'
trusted_taggers = ['bodhi']
[[consumer_config.koji_instances.primary.tags]]
from = "f33-pending"
to = "f33"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
[[consumer_config.koji_instances.primary.tags]]
from = "f33-modular-pending"
to = "f33-modular"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
type = "modular"
[[consumer_config.koji_instances.primary.tags]]
from = "f33-modular-updates-candidate"
to = "f33-modular"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
keyid = "{{ (env == 'production')|ternary('12c944d0', 'd300e724') }}"
type = "modular"
# [[consumer_config.koji_instances.primary.tags]]
# from = "f32-signing-pending"
# to = "f32-updates-testing-pending"
@ -469,15 +507,43 @@ handlers = ["console"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-31', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/x86_64/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/aarch64/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/updates/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/32/ppc64le/testing/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
[consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
[consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
[consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"]
directory = "/mnt/fedora_koji/koji/compose/ostree/repo/"
key = "{{ (env == 'production')|ternary('fedora-32', 'testkey') }}"
key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}"
[consumer_config.coreos]

2
vars/all/FedoraBranched.yaml
View file

@ -1 +1 @@
FedoraBranched: False
FedoraBranched: True