#1010 Add support for building Fedora Kinoite
Merged a year ago by kevin. Opened a year ago by siosm.
siosm/pungi-fedora main  into  main

file modified
+1
@@ -186,6 +186,7 @@ 

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

             'Silverblue': 'SB',

+               'Kinoite': 'Knt',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',

           'Design_suite': 'Dsgn',

file modified
+1
@@ -186,6 +186,7 @@ 

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

             'Silverblue': 'SB',

+               'Kinoite': 'Knt',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',

           'Design_suite': 'Dsgn',

file modified
+95
@@ -272,6 +272,7 @@ 

                'Rawhide': 'rawh',

          'Astronomy_KDE': 'AstK',

             'Silverblue': 'SB',

+               'Kinoite': 'Knt',

               'Cinnamon': 'Cinn',

                  'Cloud': 'C',

             'Comp_Neuro': 'CNr',
@@ -739,6 +740,19 @@ 

          "ostree_ref": "fedora/rawhide/${basearch}/silverblue",

          "arches": ["x86_64", "ppc64le", "aarch64"],

          "failable": ['*'],

+     },

+     "^Kinoite$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "force_new_commit": True,

+         "treefile": "fedora-kinoite.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}/kinoite",

+         "arches": ["x86_64", "ppc64le", "aarch64"],

+         "failable": ['*'],

      }

  }

  
@@ -823,6 +837,87 @@ 

              'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],

              'failable': ['*'],

          }

+     }),

+     ("^Kinoite$", {

+         "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",

+                              "ostree-based-installer/lorax-embed-flatpaks.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-35-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",

+                 "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/f34",

+             ],

+             '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': ['*'],

+         },

+         "ppc64le": {

+             "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-35-primary",

+                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

+                 "ostree_install_ref=fedora/rawhide/ppc64le/kinoite",

+                 "ostree_update_ref=fedora/rawhide/ppc64le/kinoite",

+                 "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': ['*'],

+         },

+         "aarch64": {

+             "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-35-primary",

+                 "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",

+                 "ostree_install_ref=fedora/rawhide/aarch64/kinoite",

+                 "ostree_update_ref=fedora/rawhide/aarch64/kinoite",

+                 "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': ['*'],

+         }

      })

  ]

  

file modified
+27 -11
@@ -124,13 +124,27 @@ 

  # armhfp/aarch64/x86_64 for Everything Cloud Container Modular Server Workstation is primary

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \

      "$DESTDIR" "$RSYNCTARGET/" \

-     --variant Everything --variant Cloud --variant Container --variant Modular \

-     --variant Server --variant Spins --variant Silverblue --variant Workstation \

+     --variant Everything \

+     --variant Cloud \

+     --variant Container \

+     --variant Modular \

+     --variant Server \

+     --variant Spins \

+     --variant Silverblue \

+     --variant Kinoite \

+     --variant Workstation \

      --link-dest="$RSYNCTARGET/Everything" --exclude=repodata

  $RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=aarch64 --arch=x86_64 --arch src \

      "$DESTDIR" "$RSYNCTARGET/" \

-     --variant Everything --variant Cloud --variant Container --variant Modular \

-     --variant Server --variant Spins --variant Silverblue --variant Workstation \

+     --variant Everything \

+     --variant Cloud \

+     --variant Container \

+     --variant Modular \

+     --variant Server \

+     --variant Spins \

+     --variant Silverblue \

+     --variant Kinoite \

+     --variant Workstation \

      --link-dest="$RSYNCTARGET/Everything" --delete-after

  

  $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
@@ -180,17 +194,19 @@ 

  # hardlink content (this will hardlink ppc64le/s390x)

  time hardlink -v "$RSYNCSECTARGET/.."

  

- # sync Silverblue to the unified ostree repo

+ # sync Silverblue and Kinoite 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 arch in x86_64 ppc64le aarch64; do

-     ref="fedora/rawhide/${arch}/silverblue"

-     if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi

- 

-     ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"

-     ostree summary -u --repo=$OSTREEDESTREPO # update summary file

+ for variant in 'silverblue' 'kinoite'; do

+     for arch in x86_64 ppc64le aarch64; do

+         ref="fedora/rawhide/${arch}/${variant}"

+         if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi

+ 

+         ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"

+         ostree summary -u --repo=$OSTREEDESTREPO # update summary file

+     done

  done

  # Set to old umask

  umask $old_umask

file modified
+7 -1
@@ -82,7 +82,13 @@ 

      <variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

+             <arch>x86_64</arch>

+             <arch>ppc64le</arch>

+         </arches>

+     </variant>

+     <variant id="Kinoite" name="Kinoite" type="variant" is_empty="true">

+         <arches>

+             <arch>aarch64</arch>

              <arch>x86_64</arch>

              <arch>ppc64le</arch>

          </arches>

Hold until some other pieces are in place:

rebased onto e453090427389de4031f138b0572785309af47a1

a year ago

Updated but still blocked on other changes first.

rebased onto 5aa6a77d1414d9bd1023108152e6b915d65d9725

a year ago

All "upstream" changes have been merged! Could someone from @releng take a look at this one? Thanks!

Hi, @siosm did you sign the commit? I get this message from pagure merge button: "This repo enforces that all commits are signed off by their author."

It looks like the commit is missing the DCO signoff stanza. @siosm can you rebase + amend the commit to add a Signed-off-by line?

rebased onto 92318ae22ced16fb0c1bce10e5b86d211718cbf1

a year ago

Should this be here? It's not defined anywhere else...

LGTM other than the armhfp ref in variants.xml

rebased onto 24e59bfc896d64e3cba0ad1f0e6e647b361f9093

a year ago

Thanks! Updated to also remove armhfp for Silverblue where it was also unused.

rebased onto babdb6d

a year ago

Pull-Request has been merged by kevin

a year ago

How should I follow / find logs for those builds from now on?