From e15133639e053cc71c03730c01f2b3cb84851b15 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 10 Aug 2021 12:32:21 +0200 Subject: [PATCH] Branching f35 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-f36.yaml | 28 ++++ .../greenwave/templates/fedora.yaml | 1 + roles/packages3/web/files/distmappings.py | 6 +- .../pkgdb-gnome-software-collections.json | 15 +- roles/releng/files/branched | 4 +- .../templates/robosignatory.toml.j2 | 141 ++++++++++++++---- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- 14 files changed, 219 insertions(+), 37 deletions(-) create mode 100644 roles/mbs/common/files/default-modules.production/platform-f36.yaml diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 43d13dc366..4452f3057e 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 = {'f34': {'topic': 'fedora', +RELEASES = {'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']}], + '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']}], + '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')} + ]}} + }, + 'f34': {'topic': 'fedora', 'version': '34', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index bf9d9ce5b5..7f5c15a111 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 f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-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 f36 f36-container f36-modular f35 f35-container f35-modular f34 f34-container f34-modular f33 f33-container f33-modular f33-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 5f90458974..e3c66e55ce 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 = [ + "f36", + "f36-container", + "f36-modular", + "f36-flatpak", "f35", "f35-container", "f35-modular", diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 6eca713139..8ffc290f7c 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -24,6 +24,8 @@ sigkeys = [ '45719a39', [% elif release.version_int == 35 %] '9867c58f', +[% elif release.version_int == 36 %] + '38ab71f4', [% 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 1f738630dc..6f2a7a434c 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -37,6 +37,8 @@ sigkeys = [ '45719a39', [% elif release.version_int == 35 %] '9867c58f', +[% elif release.version_int == 36 %] + '38ab71f4', [% 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 186802f2ae..aa96bfdac4 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -181,6 +181,7 @@ package_list = all :: deny sidetag = + tag f36-build :: allow tag f35-build :: allow tag f34-build :: allow tag f33-build :: allow diff --git a/roles/mbs/common/files/default-modules.production/platform-f36.yaml b/roles/mbs/common/files/default-modules.production/platform-f36.yaml new file mode 100644 index 0000000000..9d48e2e378 --- /dev/null +++ b/roles/mbs/common/files/default-modules.production/platform-f36.yaml @@ -0,0 +1,28 @@ +data: + description: Fedora 36 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: f36 + summary: Fedora 36 traditional base + context: 00000000 + version: 1 + xmd: + mbs: + buildrequires: {} + commit: f36 + requires: {} + koji_tag: module-f36-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 1677551890..e4e7f19a6f 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-36 - fedora-35 - fedora-34 - fedora-33 diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index e24a83b145..0897776d02 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': 'f35'}, +tags = ({'name': 'Rawhide', 'tag': 'f36'}, + + {'name': 'Fedora 35', 'tag': 'f35-updates'}, + {'name': 'Fedora 35', 'tag': 'f35'}, + {'name': 'Fedora 35 Testing', 'tag': 'f35-updates-testing'}, {'name': 'Fedora 34', 'tag': 'f34-updates'}, {'name': 'Fedora 34', 'tag': 'f34'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index ffc3a6fdce..47369760f3 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -4,13 +4,24 @@ "allow_retire": true, "branchname": "master", "date_created": "2014-05-14 12:36:15", - "date_updated": "2020-02-11 17:07:23", - "dist_tag": ".fc35", + "date_updated": "2020-08-10 17:07:23", + "dist_tag": ".fc36", "koji_name": "rawhide", "name": "Fedora", "status": "Under Development", "version": "devel" }, + { + "allow_retire": false, + "branchname": "f35", + "date_created": "2014-08-11 12:36:15", + "date_updated": "2020-08-10 17:07:23", + "dist_tag": ".fc35", + "koji_name": "f35", + "name": "Fedora", + "status": "Under Development", + "version": "35" + }, { "allow_retire": false, "branchname": "f34", diff --git a/roles/releng/files/branched b/roles/releng/files/branched index 31179e7fa7..cd4ad8d10f 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 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 +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 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 e19ef8bb96..cb0469ffaa 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -125,6 +125,11 @@ handlers = ["console"] 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" + key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" # Gated coreos-pool tag @@ -146,44 +151,87 @@ handlers = ["console"] 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" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('38ab71f4', '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') }}" + from = "f36-signing-pending" + to = "f36-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('38ab71f4', '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-' + pattern = 'f36-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') }}" + from = "f36-pending" + to = "f36" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('38ab71f4', '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') }}" + from = "f36-modular-pending" + to = "f36-modular" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('38ab71f4', 'd300e724') }}" type = "modular" [[consumer_config.koji_instances.primary.tags]] - from = "f35-modular-updates-candidate" - to = "f35-modular" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('9867c58f', 'd300e724') }}" + from = "f36-modular-updates-candidate" + to = "f36-modular" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + 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-' +# 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 = "f35-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" @@ -359,23 +407,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-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/armhfp/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/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/devel/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/devel/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/stable/x86_64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" @@ -443,26 +491,63 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-34', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/x86_64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/35/aarch64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/ppc64le/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + [consumer_config.ostree_refs."fedora/35/x86_64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-35', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" [consumer_config.coreos] bucket = "fcos-builds" 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..aba8be21c8 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: preenable