Update repo to remove f35 references

Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
Update fedora-container.conf remove f35 references
2023-04-18 14:42:52 +05:30 · 2023-04-17 08:15:22 +00:00 · 2023-04-13 11:18:12 -07:00 · 2023-04-12 18:06:41 -07:00 · 2023-04-11 16:52:52 -07:00 · 2023-04-11 16:26:30 -07:00
8 changed files with 2248 additions and 72 deletions
--- a/cloud-nightly.sh
+++ b/cloud-nightly.sh
@ -13,9 +13,9 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Cloud"
-RELEASE="35"
-RELEASE_TITLE="35"
-COMPSFILE="comps-f35.xml"
+RELEASE="38"
+RELEASE_TITLE="38"
+COMPSFILE="comps-f38.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="test-reports@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
--- a/container-nightly.sh
+++ b/container-nightly.sh
@ -12,9 +12,9 @@ DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
 SHORT="Fedora-Docker"
-RELEASE="35"
-RELEASE_TITLE="35"
-COMPSFILE="comps-f35.xml"
+RELEASE="38"
+RELEASE_TITLE="38"
+COMPSFILE="comps-f38.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="test-reports@lists.fedoraproject.org"
 FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
--- a/fedora-beta.conf
+++ b/fedora-beta.conf
--- a/fedora-container.conf
+++ b/fedora-container.conf
@ -1,7 +1,7 @@
 # PRODUCT INFO
 release_name = 'Fedora-Container'
 release_short = 'Fedora-Container'
-release_version = '35'
+release_version = '38'
 release_is_layered = False
 skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
 # GENERAL SETTINGS
@ -10,8 +10,8 @@ comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
    'branch': 'main',
-    'file': 'comps-f35.xml',
-    'command': 'make comps-f35.xml'
+    'file': 'comps-f38.xml',
+    'command': 'make comps-f38.xml'
 }
 variants_file='variants-fedora.xml'
 sigkeys = ['5323552A'] # None = unsigned
@ -26,10 +26,10 @@ hashed_directories = True
 runroot = True
 #runroot_channel = 'fedora_compose'
 runroot_channel = 'compose'
-runroot_tag = 'f35-build'
+runroot_tag = 'f38-build'
 # PKGSET
 pkgset_source = 'koji' # koji, repos
-pkgset_koji_tag = 'f35-updates'
+pkgset_koji_tag = 'f38-updates'
 pkgset_koji_inherit = True
 filter_system_release_packages = False
 # GATHER
@ -214,10 +214,10 @@ translate_paths = [
 ]

 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f38'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = '35'
-global_target = 'f35'
+global_version = '38'
+global_target = 'f38'

 image_build = {
    '^Container$': [
@ -229,18 +229,18 @@ image_build = {
                    'distro': 'Fedora-22',
                    'disk_size': 5,
                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
                    ],
                    'subvariant': 'Container_Base'
                    },
            'factory-parameters': {
                'dockerversion': "1.10.1",
                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
+                'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}',
            },
        },
        {
@ -251,18 +251,18 @@ image_build = {
                    'distro': 'Fedora-22',
                    'disk_size': 5,
                    'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
-                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
+                    'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
                    'repo': [
-                        'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
-                        'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
+                        'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
                    ],
                    'subvariant': 'Container_Minimal_Base',
                    },
            'factory-parameters': {
                'dockerversion': "1.10.1",
                'docker_cmd':  '[ "/bin/bash" ]',
-                'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
-                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
+                'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]',
+                'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}',
            },
        }
        ],
--- a/fedora-final.conf
+++ b/fedora-final.conf
--- a/fedora.conf
+++ b/fedora.conf
@ -1,26 +1,26 @@
 # PRODUCT INFO
 release_name = 'Fedora'
 release_short = 'Fedora'
-release_version = 'Rawhide'
+release_version = '38'

 # GENERAL SETTINGS
 comps_file = {
    'scm': 'git',
    'repo': 'https://pagure.io/fedora-comps.git',
    'branch': 'main',
-    'file': 'comps-rawhide.xml',
-    'command': 'make comps-rawhide.xml'
+    'file': 'comps-f38.xml',
+    'command': 'make comps-f38.xml'
 }
 module_defaults_dir = {
    'scm': 'git',
    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'main',
+    'branch': 'f38',
    'dir': '.'
 }
 module_obsoletes_dir = {
    'scm': 'git',
    'repo': 'https://pagure.io/releng/fedora-module-defaults.git',
-    'branch': 'main',
+    'branch': 'f38',
    'dir': 'obsoletes'
 }

@ -81,7 +81,7 @@ repoclosure_backend = 'dnf'
 createrepo_deltas = False
 createrepo_database = True
 createrepo_use_xz = True
-createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/rawhide']
+createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/%s' % pkgset_koji_tag ]
 createrepo_num_workers = 10

 # CHECKSUMS
@ -367,9 +367,9 @@ translate_paths = [
 ]

 # These will be inherited by live_media, live_images and image_build
-global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'
+global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f38'
 global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
-global_version = 'Rawhide'
+global_version = '38'
 # live_images ignores this in favor of live_target
 global_target = 'f38'

@ -527,7 +527,6 @@ image_build = {
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
                    'subvariant': 'Minimal',
-                    'failable': ['aarch64'],
                     }
        },
        {
@ -536,7 +535,7 @@ image_build = {
                    'name': 'Fedora-KDE',
                    'kickstart': 'fedora-disk-kde.ks',
                    'distro': 'Fedora-30',
-                    'disk_size': 15,
+                    'disk_size': 16,
                    'arches': ['aarch64'],
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
@ -564,7 +563,7 @@ image_build = {
                    'name': 'Fedora-Xfce',
                    'kickstart': 'fedora-disk-xfce.ks',
                    'distro': 'Fedora-30',
-                    'disk_size': 12,
+                    'disk_size': 13,
                    'arches': ['aarch64'],
                    'repo': 'Everything',
                    'install_tree_from': 'Everything',
@ -857,11 +856,11 @@ ostree = {
        "force_new_commit": True,
        "treefile": "fedora-silverblue.yaml",
        "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f38",
        "repo": "Everything",
        "tag_ref": False,
        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "ostree_ref": "fedora/38/${basearch}/silverblue",
        "arches": ["x86_64", "ppc64le", "aarch64"],
        "failable": ['*'],
    },
@ -870,11 +869,11 @@ ostree = {
        "force_new_commit": True,
        "treefile": "fedora-kinoite.yaml",
        "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f38",
        "repo": "Everything",
        "tag_ref": False,
        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
+        "ostree_ref": "fedora/38/${basearch}/kinoite",
        "arches": ["x86_64", "ppc64le", "aarch64"],
        "failable": ['*'],
    },
@ -883,11 +882,11 @@ ostree = {
        "force_new_commit": True,
        "treefile": "fedora-sericea.yaml",
        "config_url": "https://pagure.io/workstation-ostree-config.git",
-        "config_branch": "main",
+        "config_branch": "f38",
        "repo": "Everything",
        "tag_ref": False,
        "ostree_repo": "/mnt/koji/compose/ostree/repo/",
-        "ostree_ref": "fedora/rawhide/${basearch}/sericea",
+        "ostree_ref": "fedora/38/${basearch}/sericea",
        "arches": ["x86_64"],
        "failable": ['*'],
    }
@ -908,16 +907,16 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/silverblue",
-                "ostree_update_ref=fedora/rawhide/x86_64/silverblue",
+                "ostree_install_ref=fedora/38/x86_64/silverblue",
+                "ostree_update_ref=fedora/38/x86_64/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f37 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f38 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.Cheese/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Weather/x86_64/stable",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -934,8 +933,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",
-                "ostree_update_ref=fedora/rawhide/ppc64le/silverblue",
+                "ostree_install_ref=fedora/38/ppc64le/silverblue",
+                "ostree_update_ref=fedora/38/ppc64le/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -943,7 +942,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -961,16 +960,16 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/aarch64/silverblue",
-                "ostree_update_ref=fedora/rawhide/aarch64/silverblue",
+                "ostree_install_ref=fedora/38/aarch64/silverblue",
+                "ostree_update_ref=fedora/38/aarch64/silverblue",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
                "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",
-                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f37 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
+                "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f38 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.Cheese/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Weather/aarch64/stable",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -989,8 +988,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/kinoite",
-                "ostree_update_ref=fedora/rawhide/x86_64/kinoite",
+                "ostree_install_ref=fedora/38/x86_64/kinoite",
+                "ostree_update_ref=fedora/38/x86_64/kinoite",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -998,7 +997,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -1015,8 +1014,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",
-                "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",
+                "ostree_install_ref=fedora/38/ppc64le/kinoite",
+                "ostree_update_ref=fedora/38/ppc64le/kinoite",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -1024,7 +1023,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -1041,8 +1040,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/aarch64/kinoite",
-                "ostree_update_ref=fedora/rawhide/aarch64/kinoite",
+                "ostree_install_ref=fedora/38/aarch64/kinoite",
+                "ostree_update_ref=fedora/38/aarch64/kinoite",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -1050,7 +1049,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
@ -1069,8 +1068,8 @@ ostree_installer = [
                "ostree_osname=fedora",
                "ostree_oskey=fedora-38-primary",
                "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",
-                "ostree_install_ref=fedora/rawhide/x86_64/sericea",
-                "ostree_update_ref=fedora/rawhide/x86_64/sericea",
+                "ostree_install_ref=fedora/38/x86_64/sericea",
+                "ostree_update_ref=fedora/38/x86_64/sericea",
                "flatpak_remote_name=fedora",
                # using registry-no-cdn avoids redirects to the CDN;
                # needed because of network restrictions on koji runroot
@ -1078,7 +1077,7 @@ ostree_installer = [
                "flatpak_remote_refs=",
            ],
            'template_repo': 'https://pagure.io/fedora-lorax-templates.git',
-            'template_branch': 'main',
+            'template_branch': 'f38',
            # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator
            'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],
            'failable': ['*'],
--- a/nightly.sh
+++ b/nightly.sh
@ -4,16 +4,16 @@
 export LC_ALL=C

 CONFIG="fedora.conf"
-TARGET_DIR="/mnt/koji/compose/rawhide"
+TARGET_DIR="/mnt/koji/compose/branched"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY="--nightly"
 SKIP_PHASES=""
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
 SHORT="Fedora"
-RELEASE="rawhide"
-RELEASE_TITLE="Rawhide"
-COMPSFILE="comps-rawhide.xml"
+RELEASE="38"
+RELEASE_TITLE="38"
+COMPSFILE="comps-38.xml"
 TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
 TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org"
 FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
@ -111,7 +111,7 @@ fi
 ./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/"  --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"

 [ -z "$ARCH" ] && {
-./releng/scripts/critpath.py --composeurl file://$DESTDIR/compose -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
+./releng/scripts/critpath.py --composeurl file://$DESTDIR/compose -o $DESTDIR/logs/critpath.txt branched &> $DESTDIR/logs/critpath.log
 }

 # Tell interested persons that the rsync is starting (zomg!)
@ -203,7 +203,7 @@ old_umask=$(umask)
 umask 0002
 for variant in 'silverblue' 'kinoite' 'sericea'; do
    for arch in x86_64 ppc64le aarch64; do
-        ref="fedora/rawhide/${arch}/${variant}"
+        ref="fedora/38/${arch}/${variant}"
        if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi

        ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
--- a/release-candidate.sh
+++ b/release-candidate.sh
@ -5,13 +5,13 @@ LABEL=$1
 # to the script are passed to pungi-koji directly.
 shift
 CONFIG="fedora-final.conf"
-TARGET_DIR="/mnt/koji/compose/26"
+TARGET_DIR="/mnt/koji/compose/38"
 #OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
 NIGHTLY=""
 SKIP_PHASES="--skip-phase=productimg"
 DEST=$(pwd)
 DATE=$(date "+%Y%m%d")
-COMPSFILE="comps-f26.xml"
+COMPSFILE="comps-f38.xml"
 TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
 # uncomment and edit for resuming a failed compose
 #COMPOSE_ID="Fedora-23-20150530.n.0"
Author	SHA1	Message	Date
Samyak Jain	9368df9a74	Update repo to remove f35 references Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>	2023-04-18 14:42:52 +05:30
Tomáš Hrčka	de791ad41c	Update fedora-container.conf remove f35 references Signed-off-by: humaton <thrcka@redhat.com>	2023-04-17 08:15:22 +00:00
Kevin Fenzi	73229024e2	rc-1.6. The rcs come at you fast Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-13 11:18:12 -07:00
Kevin Fenzi	2c45d5cc04	rc 1.5. This is to pick up a comps change installing nvme-cli. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-12 18:06:41 -07:00
Kevin Fenzi	2c9e3d6eb2	ok, let us try a rc4 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-11 16:52:52 -07:00
Kevin Fenzi	430ead1ed7	rc-1.2 was not entirely successfull. Lets try a 1.3 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-11 16:26:30 -07:00
Kalev Lember	7d256430a9	fedora-final.conf: Sync changes from fedora.conf Make sure the aarch64 minimal disk image isn't marked as failable (commit `562fc35`) and bump disk sizes for KDE and Xfce disk images (commit `ca6b111`). Signed-off-by: Kalev Lember <klember@redhat.com>	2023-04-11 20:22:58 +00:00
Kevin Fenzi	2d808f72e6	prep for rc-1.2 and fix labels in iso images. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-11 10:14:59 -07:00
Kevin Fenzi	4be17b27d9	Prep for f38 rc 1.1 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-04-07 09:46:08 -07:00
Adam Williamson	562fc35dbe	Mark aarch64 minimal disk image as non-failable It's now release-blocking: https://pagure.io/fesco/issue/2963 so it should not be failable. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2023-03-29 10:03:23 +00:00
Kalev Lember	92413a0fbc	Switch to F38 flatpak runtime for Silverblue All the preinstalled apps are now rebuilt and using the F38 runtime. Signed-off-by: Kalev Lember <klember@redhat.com>	2023-03-29 08:49:40 +02:00
Adam Williamson	ca6b1119a6	Bump disk sizes for KDE and Xfce disk images These are both currently failing due to lack of disk space: https://pagure.io/releng/failed-composes/issue/4758#comment-847350 Signed-off-by: Adam Williamson <awilliam@redhat.com>	2023-03-17 09:07:02 -07:00
Kevin Fenzi	500bc274cd	beta: prep for rc 1.3, fix compose tag, fix image label Prep for doing a 1.3 compose (1.1 and 1.2 were not usable) Fix the compose tag to use f38-compose, so we pick up the builds that are overrides from the nightly/regular composes. Fix the image label to include Beta in it instead of being date based like the nightly ones. Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2023-03-07 08:48:47 -08:00
Tomáš Hrčka	f103b9a8a9	Update fedora-beta.conf Signed-off-by: humaton <thrcka@redhat.com>	2023-03-07 05:42:47 +00:00
Tomáš Hrčka	9f04651c1f	Update release-candidate.sh Signed-off-by: humaton <thrcka@redhat.com>	2023-03-03 08:43:45 +00:00
Tomas Hrcka	330d1b259b	Prepare for F38 Beta RC 1.1 Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2023-03-01 11:08:55 +01:00
Samyak Jain	eb0e890c48	correct tags s/main/38/g Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>	2023-02-09 17:28:01 +05:30
Tomas Hrcka	2308e8c8ab	Use correct filename for comps Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2023-02-09 12:53:16 +01:00
Tomas Hrcka	effdca3c4b	Fix typo Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2023-02-09 11:41:59 +01:00
Samyak Jain	6d62261bbd	Branch F38 from rawhide Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>	2023-02-08 23:35:12 +01:00