From a7dcdbd794e728f7b80b1afc6c142c0196b8c1a3 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Aug 2022 15:48:40 +0200 Subject: [PATCH] Branch Fedora 37 from rawhide Signed-off-by: Tomas Hrcka --- roles/bodhi2/backend/files/new-updates-sync | 52 ++++- 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-f38.yaml | 28 +++ .../greenwave/templates/fedora.yaml | 3 +- roles/packages3/web/files/distmappings.py | 6 +- .../pkgdb-gnome-software-collections.json | 26 ++- roles/releng/files/branched | 4 +- .../templates/robosignatory.toml.j2 | 180 +++++++++++++++--- vars/all/FedoraBranched.yaml | 2 +- vars/all/FedoraBranchedBodhi.yaml | 2 +- 14 files changed, 282 insertions(+), 32 deletions(-) create mode 100644 roles/mbs/common/files/default-modules.production/platform-f38.yaml diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 7c48ceefa5..e8e04face6 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -26,7 +26,57 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f36': {'topic': 'fedora', +RELEASES = {'f37': {'topic': 'fedora', + 'version': '37', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f37-updates', + 'ostrees': [{'ref': 'fedora/37/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/37/%(arch)s/updates/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '37', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '37', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f37-updates-testing', + 'ostrees': [{'ref': 'fedora/37/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/37/%(arch)s/testing/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '37', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '37', 'Everything')} + ]}} + }, + 'f37m': {'topic': 'fedora', + 'version': '37m', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f37-modular-updates', + 'ostrees': [], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, '37', 'Modular')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '37', 'Modular')} + ]}, + 'updates-testing': { + 'from': 'f37-modular-updates-testing', + 'ostrees': [], + 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '37', 'Modular')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '37', 'Modular')} + ]}} + }, + 'f36': {'topic': 'fedora', 'version': '36', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index ce92ed3182..053befb587 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -87,7 +87,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 f37 f37-container f37-modular f36 f36-container f36-modular f35 f35-container f35-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f38 f38-container f38-modular f37 f37-container f37-modular f36 f36-container f36-modular f35 f35-container f35-modular epel9 epel9-next epel8 epel8-next epel8-modular epel7 module-package-list modular'" cron_file=update-koji-owner user=apache when: env == "production" diff --git a/roles/bodhi2/backend/templates/koji_sync_listener.toml b/roles/bodhi2/backend/templates/koji_sync_listener.toml index 4e0033fcd2..2dc2888551 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 = [ + "f38", + "f38-container", + "f38-modular", + "f38-flatpak", "f37", "f37-container", "f37-modular", diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index f79403e212..f96faf7e94 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -28,6 +28,8 @@ sigkeys = [ '38ab71f4', [% elif release.version_int == 37 %] '5323552a', +[% elif release.version_int == 38 %] + '5323552a', [% 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 b66604717e..f2925bb4b6 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -41,6 +41,8 @@ sigkeys = [ '38ab71f4', [% elif release.version_int == 37 %] '5323552a', +[% elif release.version_int == 38 %] + '5323552a', [% 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 394fc54053..e20edd428c 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 f38-build :: allow tag f37-build :: allow tag f36-build :: allow tag f35-build :: allow diff --git a/roles/mbs/common/files/default-modules.production/platform-f38.yaml b/roles/mbs/common/files/default-modules.production/platform-f38.yaml new file mode 100644 index 0000000000..703df10a96 --- /dev/null +++ b/roles/mbs/common/files/default-modules.production/platform-f38.yaml @@ -0,0 +1,28 @@ +data: + description: Fedora 38 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: f38 + summary: Fedora 38 traditional base + context: 00000000 + version: 1 + xmd: + mbs: + buildrequires: {} + commit: f38 + requires: {} + koji_tag: module-f38-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 92416f5837..079d98875b 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-38 - fedora-37 - fedora-36 - fedora-35 @@ -92,9 +93,9 @@ product_versions: # to include whatever version Rawhide is, as openQA tests don't run # on Rawhide. So for now this list needs to be updated each time a # release is branched (or goes EOL). - - fedora-34 - fedora-35 - fedora-36 + - fedora-37 decision_contexts: - bodhi_update_push_testing_critpath - bodhi_update_push_stable_critpath diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index 52343d61d4..4aa6ebca74 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': 'f37'}, +tags = ({'name': 'Rawhide', 'tag': 'f38'}, + + {'name': 'Fedora 37', 'tag': 'f37-updates'}, + {'name': 'Fedora 37', 'tag': 'f37'}, + {'name': 'Fedora 37 Testing', 'tag': 'f37-updates-testing'}, {'name': 'Fedora 36', 'tag': 'f36-updates'}, {'name': 'Fedora 36', 'tag': 'f36'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index 483b115d51..0190f166dd 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -4,13 +4,35 @@ "allow_retire": true, "branchname": "master", "date_created": "2014-05-14 12:36:15", - "date_updated": "2022-05-09 17:07:23", - "dist_tag": ".fc37", + "date_updated": "2022-08-09 17:07:23", + "dist_tag": ".fc38", "koji_name": "rawhide", "name": "Fedora Linux", "status": "Under Development", "version": "devel" }, + { + "allow_retire": true, + "branchname": "master", + "date_created": "2014-05-14 12:36:15", + "date_updated": "2022-08-09 17:07:23", + "dist_tag": ".fc37", + "koji_name": "f37", + "name": "Fedora Linux", + "status": "Under Development", + "version": "devel" + }, + { + "allow_retire": true, + "branchname": "master", + "date_created": "2014-05-14 12:36:15", + "date_updated": "2022-08-09 17:07:23", + "dist_tag": ".fc37", + "koji_name": "f37", + "name": "Fedora", + "status": "Under Development", + "version": "devel" + }, { "allow_retire": true, "branchname": "master", diff --git a/roles/releng/files/branched b/roles/releng/files/branched index a6dced2ca0..3dda5a2c6c 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 f36 && /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 f37 && /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 aec63a1e5e..fb02e461b2 100644 --- a/roles/robosignatory/templates/robosignatory.toml.j2 +++ b/roles/robosignatory/templates/robosignatory.toml.j2 @@ -129,6 +129,17 @@ handlers = ["console"] file_signing_key = "fedora-37-ima" {% endif %} + [[consumer_config.koji_instances.primary.tags]] + from = "f38-infra-candidate" + to = "f38-infra-stg" + key = "{{ (env == 'production')|ternary('fedora-infra', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('47dd8ef9', 'd300e724') }}" + {% if env == "production" %} + # ima file signing - enabled in f37 + file_signing_key = "fedora-38-ima" + {% endif %} + + # Gated coreos-pool tag [[consumer_config.koji_instances.primary.tags]] @@ -148,39 +159,90 @@ handlers = ["console"] to = "coreos-pool" key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" - - # Gated rawhide and branched - - [[consumer_config.koji_instances.primary.tags]] - from = "f37-signing-pending" - to = "f37-updates-testing-pending" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" - keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" {% if env == "production" %} # ima file signing - enabled in f37 file_signing_key = "fedora-37-ima" {% endif %} + [[consumer_config.koji_instances.primary.tags]] + from = "f38-coreos-signing-pending" + to = "coreos-pool" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + {% if env == "production" %} + # ima file signing - enabled in f37 + file_signing_key = "fedora-38-ima" + {% endif %} + + + # Gated rawhide and branched + + [[consumer_config.koji_instances.primary.tags]] + from = "f38-signing-pending" + to = "f38-updates-testing-pending" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + {% if env == "production" %} + # ima file signing - enabled in f37 + file_signing_key = "fedora-38-ima" + {% endif %} + [consumer_config.koji_instances.primary.tags.sidetags] - pattern = 'f37-build-side-' + pattern = 'f38-build-side-' from = '-signing-pending' to = '-testing-pending' trusted_taggers = ['bodhi'] {% if env == "production" %} # ima file signing - enabled in f37 - file_signing_key = "fedora-37-ima" + file_signing_key = "fedora-38-ima" {% endif %} [[consumer_config.koji_instances.primary.tags]] - from = "f37-pending" - to = "f37" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + from = "f38-pending" + to = "f38" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" {% if env == "production" %} # ima file signing - enabled in f37 - file_signing_key = "fedora-37-ima" + file_signing_key = "fedora-38-ima" {% endif %} + [[consumer_config.koji_instances.primary.tags]] + from = "f38-modular-pending" + to = "f38-modular" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + type = "modular" + + [[consumer_config.koji_instances.primary.tags]] + from = "f38-modular-updates-candidate" + to = "f38-modular" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + type = "modular" + + #[[consumer_config.koji_instances.primary.tags]] + #from = "f37-signing-pending" + #to = "f37-updates-testing-pending" + #key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + #keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + #{% if env == "production" %} + ## ima file signing - disable for now per fesco + ## file_signing_key = "fedora-37-ima" + #{% endif %} +# + #[consumer_config.koji_instances.primary.tags.sidetags] + #pattern = 'f37-build-side-' + #from = '-signing-pending' + #to = '-testing-pending' + #trusted_taggers = ['bodhi'] + + #[[consumer_config.koji_instances.primary.tags]] + #from = "f37-pending" + #to = "f37" + #key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + #keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + [[consumer_config.koji_instances.primary.tags]] from = "f37-modular-pending" to = "f37-modular" @@ -362,6 +424,13 @@ handlers = ["console"] # openh264 signing + [[consumer_config.koji_instances.primary.tags]] + from = "f38-openh264" + to = "f38-openh264" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + keyid = "{{ (env == 'production')|ternary('5323552a', 'd300e724') }}" + + [[consumer_config.koji_instances.primary.tags]] from = "f37-openh264" to = "f37-openh264" @@ -425,12 +494,22 @@ 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-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/aarch64/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/armhfp/iot"] directory = "/mnt/fedora_koji/koji/compose/iot/repo/" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/devel/x86_64/iot"] + directory = "/mnt/fedora_koji/koji/compose/iot/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/devel/aarch64/iot"] + directory = "/mnt/fedora_koji/koji/compose/iot/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/devel/armhfp/iot"] + directory = "/mnt/fedora_koji/koji/compose/iot/repo/" key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" [consumer_config.ostree_refs."fedora/devel/x86_64/iot"] @@ -565,15 +644,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/updates/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/testing/silverblue"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + + [consumer_config.ostree_refs."fedora/rawhide/aarch64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/silverblue"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/35/x86_64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" @@ -631,16 +739,44 @@ handlers = ["console"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" key = "{{ (env == 'production')|ternary('fedora-36', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/x86_64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/aarch64/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/updates/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/37/ppc64le/testing/kinoite"] + directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" + key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + [consumer_config.ostree_refs."fedora/rawhide/aarch64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/ppc64le/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', 'testkey') }}" [consumer_config.ostree_refs."fedora/rawhide/x86_64/kinoite"] directory = "/mnt/fedora_koji/koji/compose/ostree/repo/" - key = "{{ (env == 'production')|ternary('fedora-37', 'testkey') }}" + key = "{{ (env == 'production')|ternary('fedora-38', '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