From fec2d575397ff5da63100f7606f8fa3c2103787c Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 13 Aug 2019 14:52:27 +0000 Subject: [PATCH] Branching F31 from rawhide Signed-off-by: Mohan Boddu --- .../backend/files/koji-sync-listener.py | 2 +- roles/bodhi2/backend/files/new-updates-sync | 44 ++++++++++++++++++- roles/bodhi2/backend/tasks/main.yml | 2 +- roles/packages3/web/files/distmappings.py | 6 ++- roles/releng/files/branched | 2 +- vars/all/FedoraBranched.yaml | 2 +- 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/roles/bodhi2/backend/files/koji-sync-listener.py b/roles/bodhi2/backend/files/koji-sync-listener.py index b333a17638..d9b6a95c0a 100644 --- a/roles/bodhi2/backend/files/koji-sync-listener.py +++ b/roles/bodhi2/backend/files/koji-sync-listener.py @@ -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 = 'f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular' + taglist = 'f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel8 epel8-playground epel7 dist-6E-epel module-package-list modular' cmd = [ '/usr/local/bin/owner-sync-pagure', '--package', package, diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 516e7c1360..975d4625c4 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -20,7 +20,49 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f30': {'topic': 'fedora', +RELEASES = {'f31': {'topic': 'fedora', + 'version': '31', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f31-updates', + 'ostrees': [{'ref': 'fedora/31/x86_64/updates/silverblue', + 'dest': OSTREEDEST}], + 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '31', 'Everything')}, + {'arches': ['i386', 'ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '31', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f31-updates-testing', + 'ostrees': [{'ref': 'fedora/31/x86_64/testing/silverblue', + 'dest': OSTREEDEST}], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Everything')}, + {'arches': ['i386', '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': ['i386', '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': ['i386', 'ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')} + ]}} + }, + 'f30': {'topic': 'fedora', 'version': '30', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index cd700c2254..29514ea815 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -65,7 +65,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 f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel7 dist-6E-epel module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f32 f32-container f32-modular f31 f31-container f31-modular f30 f30-container f30-flatpak f30-modular f29 f29-container f29-flatpak f29-modular epel7 dist-6E-epel module-package-list modular'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index 6115a1784f..d3e85858c2 100644 --- a/roles/packages3/web/files/distmappings.py +++ b/roles/packages3/web/files/distmappings.py @@ -1,5 +1,9 @@ # Global list of koji tags we care about -tags = ({'name': 'Rawhide', 'tag': 'f31'}, +tags = ({'name': 'Rawhide', 'tag': 'f32'}, + + {'name': 'Fedora 31', 'tag': 'f31-updates'}, + {'name': 'Fedora 31', 'tag': 'f31'}, + {'name': 'Fedora 31 Testing', 'tag': 'f31-updates-testing'}, {'name': 'Fedora 30', 'tag': 'f30-updates'}, {'name': 'Fedora 30', 'tag': 'f30'}, diff --git a/roles/releng/files/branched b/roles/releng/files/branched index febd069390..966f5c3c86 100644 --- a/roles/releng/files/branched +++ b/roles/releng/files/branched @@ -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 f30 && /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 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 diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 14b99820be..42ac5347b2 100644 --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1 +1 @@ -FedoraBranched: False +FedoraBranched: True