#1170 Add Fedora Onyx immutable variant
Merged 10 months ago by kevin. Opened 11 months ago by joshstrobl.
joshstrobl/pungi-fedora fedora-onyx  into  main

Add Fedora Onyx immutable variant
Joshua Strobl • 10 months ago  
file modified
+41
@@ -767,6 +767,19 @@ 

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

          "arches": ["x86_64"],

          "failable": ['*'],

+     },

+     "^Onyx$": {

+         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",

+         "force_new_commit": True,

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

+         "arches": ["x86_64"],

+         "failable": ['*'],

      }

  }

  
@@ -962,6 +975,34 @@ 

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

              'failable': ['*'],

          }

+     }),

+     ("^Onyx$", {

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

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

+                 "ostree_install_ref=fedora/rawhide/x86_64/Onyx",

+                 "ostree_update_ref=fedora/rawhide/x86_64/Onyx",

+                 "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
+1
@@ -61,6 +61,7 @@ 

                 'Images': 'img',

                'Jam_KDE': 'Jam',

            'MATE_Compiz': 'MATE',

+                  'Onyx': 'Onyx',

       # Note https://pagure.io/pungi-fedora/issue/533

       'Python-Classroom': 'Clss',

       'Python_Classroom': 'Clss',

file modified
+4 -2
@@ -133,6 +133,7 @@ 

      --variant Silverblue \

      --variant Kinoite \

      --variant Sericea \

+     --variant Onyx \

      --variant Workstation \

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

  $RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
@@ -146,6 +147,7 @@ 

      --variant Silverblue \

      --variant Kinoite \

      --variant Sericea \

+     --variant Onyx \

      --variant Workstation \

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

  
@@ -196,12 +198,12 @@ 

  # hardlink content (this will hardlink ppc64le/s390x)

  time hardlink -v "$RSYNCSECTARGET/.."

  

- # sync Silverblue, Kinoite and Sericea to the unified ostree repo

+ # sync Silverblue, Kinoite, Sericea, and Onyx 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' 'sericea'; do

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

      for arch in x86_64 ppc64le aarch64; do

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

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

file modified
+5
@@ -98,6 +98,11 @@ 

              <arch>x86_64</arch>

          </arches>

      </variant>

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

+         <arches>

+             <arch>x86_64</arch>

+         </arches>

+     </variant>

      <variant id="Modular" name="Modular" type="variant">

          <arches>

              <arch>armhfp</arch>