diff --git a/fedora.conf b/fedora.conf index 7e82bd6..996ddad 100644 --- a/fedora.conf +++ b/fedora.conf @@ -1,15 +1,15 @@ # 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-38.xml', + 'command': 'make comps-38.xml' } module_defaults_dir = { 'scm': 'git', @@ -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 @@ -369,7 +369,7 @@ 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_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' @@ -861,7 +861,7 @@ ostree = { "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": ['*'], }, @@ -874,7 +874,7 @@ ostree = { "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": ['*'], }, @@ -887,7 +887,7 @@ ostree = { "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,8 +908,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/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 @@ -917,7 +917,7 @@ ostree_installer = [ "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", ], '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 +934,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 +943,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,8 +961,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/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 @@ -970,7 +970,7 @@ ostree_installer = [ "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", ], '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 +989,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 +998,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 +1015,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 +1024,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 +1041,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 +1050,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 +1069,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 +1078,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': ['*'], diff --git a/nightly.sh b/nightly.sh index a69c43e..f98cd5b 100755 --- 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 " @@ -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}"