From c6b02d2071f25f2eb495e2159f9f12b75d3ca723 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 18:01:33 +0100 Subject: [PATCH] Branching f34 from rawhide Signed-off-by: Tomas Hrcka --- roles/bodhi2/backend/files/new-updates-sync | 46 ++++++++- roles/bodhi2/backend/tasks/main.yml | 2 +- .../backend/templates/koji_sync_listener.toml | 4 + .../backend/templates/pungi.module.conf.j2 | 2 + .../backend/templates/pungi.rpm.conf.j2 | 2 + roles/koji_hub/templates/hub.conf.j2 | 1 + .../platform-f35.yaml | 28 ++++++ .../greenwave/templates/fedora.yaml | 1 + roles/packages3/web/files/distmappings.py | 7 +- .../pkgdb-gnome-software-collections.json | 13 ++- roles/releng/files/branched | 2 +- .../templates/robosignatory.toml.j2 | 97 +++++++++++++++++-- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- 14 files changed, 192 insertions(+), 17 deletions(-) create mode 100644 roles/mbs/common/files/default-modules.production/platform-f35.yaml diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index ec3990434c..472b2bb7ba 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -26,7 +26,51 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f33': {'topic': 'fedora', +RELEASES = {'f34': {'topic': 'fedora', + 'version': '34', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f34-updates', + 'ostrees': [{'ref': 'fedora/34/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '34', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '34', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f34-updates-testing', + 'ostrees': [{'ref': 'fedora/34/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '34', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '34', 'Everything')} + ]}} + }, + 'f34m': {'topic': 'fedora', + 'version': '34m', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f34-modular-updates', + 'ostrees': [], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, '34', 'Modular')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '34', 'Modular')} + ]}, + 'updates-testing': { + 'from': 'f34-modular-updates-testing', + 'ostrees': [], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '34', 'Modular')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '34', 'Modular')} + ]}} + }, + 'f33': {'topic': 'fedora', 'version': '33', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index dac5f17385..992fc861dd 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -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 epel8 epel8-playground epel8-modular epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f35 f35-container f35-modular 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 module-package-list modular'" cron_file=update-koji-owner when: env == "production" tags: diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 3008104950..bfd94186e8 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -36,6 +36,10 @@ arguments = {} # XXX If you modify this taglist. Please also modify the other copy in # bodhi2/backend/tasks/main.yml taglist = [ + "f35", + "f35-container", + "f35-modular", + "f35-flatpak", "f34", "f34-container", "f34-modular", diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 4c7a93a949..6eca713139 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -22,6 +22,8 @@ sigkeys = [ '9570ff31', [% elif release.version_int == 34 %] '45719a39', +[% elif release.version_int == 35 %] + '9867c58f', [% elif release.version_int == 8 %] '2f86d6a1', [% endif %] diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index d2fe11a238..a0e3f9c1a0 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -35,6 +35,8 @@ sigkeys = [ '9570ff31', [% elif release.version_int == 34 %] '45719a39', +[% elif release.version_int == 35 %] + '9867c58f', [% elif release.version_int == 6 %] '0608b895', [% elif release.version_int == 7 %] diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 2e92b42a86..7f5bb1dcf4 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -184,6 +184,7 @@ package_list = all :: deny sidetag = + tag f35-build :: allow tag f34-build :: allow tag f33-build :: allow tag f32-build :: allow diff --git a/roles/mbs/common/files/default-modules.production/platform-f35.yaml b/roles/mbs/common/files/default-modules.production/platform-f35.yaml new file mode 100644 index 0000000000..9f69f65b63 --- /dev/null +++ b/roles/mbs/common/files/default-modules.production/platform-f35.yaml @@ -0,0 +1,28 @@ +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 + \ No newline at end of file diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml index 57403ff5a9..6cf0f9a8bc 100644 --- a/roles/openshift-apps/greenwave/templates/fedora.yaml +++ b/roles/openshift-apps/greenwave/templates/fedora.yaml @@ -66,6 +66,7 @@ rules: [] id: "kojibuild_bodhipush_remoterule" product_versions: - fedora-rawhide + - fedora-35 - fedora-34 - fedora-33 - fedora-32 diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index 890b2fb5d7..e24a83b145 100644 --- a/roles/packages3/web/files/distmappings.py +++ b/roles/packages3/web/files/distmappings.py @@ -1,5 +1,10 @@ # Global list of koji tags we care about -tags = ({'name': 'Rawhide', 'tag': 'f34'}, +tags = ({'name': 'Rawhide', 'tag': 'f35'}, + + {'name': 'Fedora 34', 'tag': 'f34-updates'}, + {'name': 'Fedora 34', 'tag': 'f34'}, + {'name': 'Fedora 34 Testing', 'tag': 'f34-updates-testing'}, + {'name': 'Fedora 33', 'tag': 'f33-updates'}, {'name': 'Fedora 33', 'tag': 'f33'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 59eed8576f..ac3b06ce24 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -5,12 +5,23 @@ "branchname": "master", "date_created": "2014-05-14 12:36:15", "date_updated": "2020-02-11 17:07:23", - "dist_tag": ".fc34", + "dist_tag": ".fc35", "koji_name": "rawhide", "name": "Fedora", "status": "Under Development", "version": "devel" }, + { + "allow_retire": false, + "branchname": "f34", + "date_created": "2014-08-11 12:36:15", + "date_updated": "2020-02-09 17:07:23", + "dist_tag": ".fc34", + "koji_name": "f34", + "name": "Fedora", + "status": "Under Development", + "version": "34" + }, { "allow_retire": false, "branchname": "f33", diff --git a/roles/releng/files/branched b/roles/releng/files/branched index 33e55878c9..a9ba0a82fd 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` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f33 && /usr/local/bin/lock-wrapper branched-compose "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` && chmod 755 $TMPDIR && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f34 && /usr/local/bin/lock-wrapper branched-compose "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/roles/robosignatory/templates/robosignatory.toml.j2 b/roles/robosignatory/templates/robosignatory.toml.j2 index c453011c7e..eb9655f4c7 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -131,6 +131,12 @@ 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') }}" + # Gated coreos-pool tag @@ -152,8 +158,51 @@ handlers = ["console"] key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('45719a39', 'd300e724') }}" + [[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') }}" + # Gated rawhide and branched + [[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-' + from = '-signing-pending' + to = '-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-updates-candidate" + to = "f34-modular" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + type = "modular" + + [[consumer_config.koji_instances.primary.tags]] from = "f34-signing-pending" to = "f34-updates-testing-pending" @@ -363,23 +412,23 @@ handlers = ["console"] [consumer_config.ostree_refs] [consumer_config.ostree_refs."fedora/rawhide/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/armhfp/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/armhfp/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" [consumer_config.ostree_refs."fedora/stable/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" @@ -496,7 +545,7 @@ handlers = ["console"] [consumer_config.ostree_refs."fedora/33/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.ostree_refs."fedora/33/aarch64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" @@ -522,16 +571,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/x86_64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/34/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-33', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.coreos] diff --git a/vars/all/FedoraBranched.yaml b/vars/all/FedoraBranched.yaml index 14b99820be..2b54595267 100644 --- a/vars/all/FedoraBranched.yaml +++ b/vars/all/FedoraBranched.yaml @@ -1 +1 @@ -FedoraBranched: False +FedoraBranched: True diff --git a/vars/all/FedoraBranchedBodhi.yaml b/vars/all/FedoraBranchedBodhi.yaml index 1e152cfba7..606eb2e208 100644 --- a/vars/all/FedoraBranchedBodhi.yaml +++ b/vars/all/FedoraBranchedBodhi.yaml @@ -3,4 +3,4 @@ # prebeta: After bodhi enablement/beta freeze and before beta release # postbeta: After beta release and before final release # current: After final release -FedoraBranchedBodhi: current +FedoraBranchedBodhi: prebeta