diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 0a9d07550a..e7dca2ffe1 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -26,7 +26,43 @@ FEDORAALTDEST = '/pub/fedora-secondary/updates/' EPELDEST = '/pub/epel/' OSTREESOURCE = '/mnt/koji/compose/ostree/repo/' OSTREEDEST = '/mnt/koji/ostree/repo/' -RELEASES = {'f38': {'topic': 'fedora', +RELEASES = {'f39': {'topic': 'fedora', + 'version': '39', + 'modules': ['fedora', 'fedora-secondary'], + 'repos': {'updates': { + 'from': 'f39-updates', + 'ostrees': [{'ref': 'fedora/39/%(arch)s/updates/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/39/%(arch)s/updates/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/39/%(arch)s/updates/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, '39', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, '39', 'Everything')} + ]}, + 'updates-testing': { + 'from': 'f39-updates-testing', + 'ostrees': [{'ref': 'fedora/39/%(arch)s/testing/silverblue', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/39/%(arch)s/testing/kinoite', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}, + {'ref': 'fedora/39/%(arch)s/testing/sericea', + 'dest': OSTREEDEST, + 'arches': ['x86_64', 'ppc64le', 'aarch64']}], + 'to': [{'arches': ['x86_64', 'aarch64', 'source'], + 'dest': os.path.join(FEDORADEST, 'testing', '39', 'Everything')}, + {'arches': ['ppc64le', 's390x'], + 'dest': os.path.join(FEDORAALTDEST, 'testing', '39', 'Everything')} + ]}} + }, + 'f38': {'topic': 'fedora', 'version': '38', 'modules': ['fedora', 'fedora-secondary'], 'repos': {'updates': { diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 1e1c866db3..82333e1a6e 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -104,7 +104,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 f39 f39-container f38 f38-container f38-modular f37 f37-container f37-modular epel9 epel9-next epel8 epel8-next epel7 module-package-list modular'" + job="/usr/local/bin/lock-wrapper owner-sync '/usr/local/bin/owner-sync-pagure f40 f40-container f39 f39-container f38 f38-container f38-modular f37 f37-container f37-modular epel9 epel9-next epel8 epel8-next 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 61357a21eb..b558526a8f 100644 --- a/roles/bodhi2/backend/templates/koji_sync_listener.toml +++ b/roles/bodhi2/backend/templates/koji_sync_listener.toml @@ -36,6 +36,9 @@ arguments = {} # XXX If you modify this taglist. Please also modify the other copy in # bodhi2/backend/tasks/main.yml taglist = [ + "f40", + "f40-container", + "f40-flatpak", "f39", "f39-container", "f39-flatpak", diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 294bb558b2..473f710798 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -37,8 +37,10 @@ sigkeys = [ 'eb10b464', [% elif release.version_int == 39 %] '18B8e74c', +[% elif release.version_int == 40 %] + 'a15B79cc', [% elif release.version_int == 8 %] - '2f86d6a1', + '2f86d6a1', [% endif %] {% if env == "staging" %} [% if release.version_int == 8 %] diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index eff31ccfe8..38a51a59c6 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -49,6 +49,8 @@ sigkeys = [ 'eb10b464', [% elif release.version_int == 39 %] '18B8e74c', +[% elif release.version_int == 40 %] + 'a15B79cc', [% 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 d469bf35cd..139fe6b003 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -193,6 +193,7 @@ package_list = all :: deny sidetag = + tag f40-build :: allow tag f39-build :: allow tag f38-build :: allow tag f37-build :: allow diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml index 8ae8163dd7..adb1aff7dc 100644 --- a/roles/openshift-apps/greenwave/templates/fedora.yaml +++ b/roles/openshift-apps/greenwave/templates/fedora.yaml @@ -116,6 +116,7 @@ rules: [] id: "kojibuild_bodhipush_remoterule" product_versions: - fedora-rawhide + - fedora-40 - fedora-39 - fedora-38 - fedora-37 diff --git a/roles/packages3/web/files/distmappings.py b/roles/packages3/web/files/distmappings.py index 0bd1661800..85caf409ef 100644 --- a/roles/packages3/web/files/distmappings.py +++ b/roles/packages3/web/files/distmappings.py @@ -1,6 +1,10 @@ # Global list of koji tags we care about -tags = ({'name': 'Rawhide', 'tag': 'f39'}, +tags = ({'name': 'Rawhide', 'tag': 'f40'}, + {'name': 'Fedora 39', 'tag': 'f39-updates'}, + {'name': 'Fedora 39', 'tag': 'f39'}, + {'name': 'Fedora 39 Testing', 'tag': 'f39-updates-testing'}, + {'name': 'Fedora 38', 'tag': 'f38-updates'}, {'name': 'Fedora 38', 'tag': 'f38'}, {'name': 'Fedora 38 Testing', 'tag': 'f38-updates-testing'}, diff --git a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json index f1fc342ab1..504e9f3d8d 100644 --- a/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json +++ b/roles/pkgdb-proxy/files/pkgdb-gnome-software-collections.json @@ -1,12 +1,23 @@ { "collections": [ + { + "allow_retire": true, + "branchname": "master", + "date_created": "2014-05-14 12:36:15", + "date_updated": "2023-08-08 17:07:23", + "dist_tag": ".fc40", + "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": "2023-02-07 17:07:23", "dist_tag": ".fc39", - "koji_name": "rawhide", + "koji_name": "f39", "name": "Fedora Linux", "status": "Under Development", "version": "devel" diff --git a/roles/releng/files/branched b/roles/releng/files/branched index daac6cdf30..aa7b03f5dd 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 f38 && /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 f39 && /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/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