#1432 Atomic Desktops: Stop building for PPC64LE
Merged 3 months ago by kevin. Opened 3 months ago by siosm.
siosm/pungi-fedora main-no-ppc64le  into  main

file modified
+4 -60
@@ -704,7 +704,7 @@ 

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

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

          "runroot_packages": ["selinux-policy-targeted"],

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

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

          "failable": ['*'],

      },

      "^Kinoite$": {
@@ -719,7 +719,7 @@ 

          "ostree_repo": "/mnt/koji/compose/ostree/repo/",

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

          "runroot_packages": ["selinux-policy-targeted"],

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

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

          "failable": ['*'],

      },

      "^Sericea$": {
@@ -760,7 +760,7 @@ 

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

          "treefile": "silverblue.yaml",

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

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

          "failable": ['*'],

      },

      "^Kinoite$": {
@@ -768,7 +768,7 @@ 

          "config_url": "https://pagure.io/workstation-ostree-config.git",

          "config_branch": "main",

          "treefile": "kinoite.yaml",

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

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

          "failable": ['*'],

      },

      "^Sericea$": {
@@ -819,34 +819,6 @@ 

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

              'failable': ['*'],

          },

-         "ppc64le": {

-             "repo": "Everything",

-             "release": None,

-             "rootfs_size": "9",

-             "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-42-primary",

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

-                 "ostree_install_ref=fedora/rawhide/ppc64le/silverblue",

-                 "ostree_update_ref=fedora/rawhide/ppc64le/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",

-                 # keeping them on the stable release until the flatpak sig confirms the next update

-                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/ppc64le/f41 app/org.gnome.baobab/ppc64le/stable app/org.gnome.Calculator/ppc64le/stable app/org.gnome.Calendar/ppc64le/stable app/org.gnome.Characters/ppc64le/stable app/org.gnome.Snapshot/ppc64le/stable app/org.gnome.clocks/ppc64le/stable app/org.gnome.Connections/ppc64le/stable app/org.gnome.Contacts/ppc64le/stable app/org.gnome.Evince/ppc64le/stable app/org.gnome.Extensions/ppc64le/stable app/org.gnome.font-viewer/ppc64le/stable app/org.gnome.TextEditor/ppc64le/stable app/org.gnome.Loupe/ppc64le/stable app/org.gnome.Logs/ppc64le/stable app/org.gnome.Maps/ppc64le/stable app/org.fedoraproject.MediaWriter/ppc64le/stable app/org.gnome.NautilusPreviewer/ppc64le/stable app/org.gnome.Weather/ppc64le/stable",

-             ],

-             '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,
@@ -905,34 +877,6 @@ 

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

              'failable': ['*'],

          },

-         "ppc64le": {

-             "repo": "Everything",

-             "release": None,

-             "rootfs_size": "11",

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

-                 # keeping them on the stable release until the flatpak sig confirms the next update

-                 "flatpak_remote_refs=runtime/org.fedoraproject.KDE6Platform/ppc64le/f41 app/org.kde.elisa/ppc64le/stable app/org.kde.gwenview/ppc64le/stable app/org.kde.kcalc/ppc64le/stable app/org.kde.kmahjongg/ppc64le/stable app/org.kde.kmines/ppc64le/stable app/org.kde.kolourpaint/ppc64le/stable app/org.kde.krdc/ppc64le/stable app/org.kde.okular/ppc64le/stable",

-             ],

-             '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,

file modified
+1 -1
@@ -202,7 +202,7 @@ 

  old_umask=$(umask)

  umask 0002

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

-     for arch in x86_64 ppc64le aarch64; do

+     for arch in x86_64 aarch64; do

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

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

  

file modified
-2
@@ -77,14 +77,12 @@ 

          <arches>

              <arch>aarch64</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>

      </variant>

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

We need to fix ./roles/bodhi2/backend/files/new-updates-sync in ansible repo for this first.

As far as I can see we don't have F42 listed in that file yet so I'm not sure what to do

Ah, oops. Indeed you are right.

I was thinking of nightly.sh here... which tries to sync ppc64le, but I guess just ignores if the ref isn't there?

Also, do we need to do anything to remove existing ppc64le refs so they don't just sit there forever and not get updated?
Or should we just leave them for now?

rebased onto bf59b47

3 months ago

I was thinking of nightly.sh here... which tries to sync ppc64le, but I guess just ignores if the ref isn't there?

Good catch, updated.

Also, do we need to do anything to remove existing ppc64le refs so they don't just sit there forever and not get updated?
Or should we just leave them for now?

I think we can remove the PPC64LE refs for rawhide once this is merged and then the older ones will get removed when we start doing garbage collection for the ostree repo (I don't know if we do anything like that right now for the Atomic Desktops, like we do for Fedora CoreOS).

Pull-Request has been merged by kevin

3 months ago