diff --git a/fedora.conf b/fedora.conf index 4645d8f..ebadcbb 100644 --- a/fedora.conf +++ b/fedora.conf @@ -336,6 +336,7 @@ volume_id_substitutions = { 'Astronomy_KDE': 'AstK', 'Silverblue': 'SB', 'Kinoite': 'Knt', + 'Sericea': 'Src', 'Cinnamon': 'Cinn', 'Cloud': 'C', 'Comp_Neuro': 'CNr', @@ -862,6 +863,19 @@ ostree = { "ostree_ref": "fedora/rawhide/${basearch}/kinoite", "arches": ["x86_64", "ppc64le", "aarch64"], "failable": ['*'], + }, + "^Sericea$": { + "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", + "force_new_commit": True, + "treefile": "fedora-sericea.yaml", + "config_url": "https://pagure.io/workstation-ostree-config.git", + "config_branch": "main", + "repo": "Everything", + "tag_ref": False, + "ostree_repo": "/mnt/koji/compose/ostree/repo/", + "ostree_ref": "fedora/rawhide/${basearch}/sericea", + "arches": ["x86_64"], + "failable": ['*'], } } @@ -1027,6 +1041,34 @@ ostree_installer = [ 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'], 'failable': ['*'], } + }), + ("^Sericea$", { + "x86_64": { + "repo": "Everything", + "release": None, + "rootfs_size": "8", + "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl", + "ostree-based-installer/lorax-embed-repo.tmpl"], + "add_template_var": [ + "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/", + "ostree_update_repo=https://ostree.fedoraproject.org", + "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", + "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=", + ], + 'template_repo': 'https://pagure.io/fedora-lorax-templates.git', + 'template_branch': 'main', + # 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 2c5b59c..a69c43e 100755 --- a/nightly.sh +++ b/nightly.sh @@ -132,6 +132,7 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \ --variant Spins \ --variant Silverblue \ --variant Kinoite \ + --variant Sericea \ --variant Workstation \ --link-dest="$RSYNCTARGET/Everything" --exclude=repodata $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \ @@ -144,6 +145,7 @@ $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \ --variant Spins \ --variant Silverblue \ --variant Kinoite \ + --variant Sericea \ --variant Workstation \ --link-dest="$RSYNCTARGET/Everything" --delete-after @@ -194,12 +196,12 @@ $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWC # hardlink content (this will hardlink ppc64le/s390x) time hardlink -v "$RSYNCSECTARGET/.." -# sync Silverblue and Kinoite to the unified ostree repo +# sync Silverblue, Kinoite and Sericea to the unified ostree repo # Set the umask to so directories can get group write # https://pagure.io/releng/issue/8811 old_umask=$(umask) umask 0002 -for variant in 'silverblue' 'kinoite'; do +for variant in 'silverblue' 'kinoite' 'sericea'; do for arch in x86_64 ppc64le aarch64; do ref="fedora/rawhide/${arch}/${variant}" if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi diff --git a/variants-fedora.xml b/variants-fedora.xml index 45b35be..f42b35d 100644 --- a/variants-fedora.xml +++ b/variants-fedora.xml @@ -93,6 +93,11 @@ ppc64le + + + x86_64 + + armhfp