Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compose: Delete non-unified-core code #1793

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

cgwalters
Copy link
Member

We still accept the --unified-core option, it just does
nothing.

We're talking about making 2019.2 the last release to support
RHEL7. That makes it also a good cutover point to just drop
the non-unified-core codepath.

Since coreos-assembler defaults to it, we know it works.
I also tested Silverblue with it.

Alternative to #1739

@jlebon
Copy link
Member

jlebon commented Mar 21, 2019

OK, so this is much more aggressive than #1739. ⏩

That WFM, though at the same time, we only really have a lot of experience with unified core mode through FCOS and RHCOS.

I also tested Silverblue with it.

Did you also boot it up? Before doing this, as a basic sanity check, we should definitely do test composes of SB and AH and boot up/rebase hosts to the composes. I don't expect anything to go wrong, but checking now is much cheaper than potentially reverting or fixing things once this is in the runroot or OSTrees are pushed out.

@dustymabe
Copy link
Member

Before doing this, as a basic sanity check, we should definitely do test composes of SB and AH and boot up/rebase hosts to the composes.

+1 - could we just take this patch and apply it to the rpm in rawhide now and test things there ? Maybe we should also wait til after f30 GA so we can stabilize and get f30SB out without issues.

@cgwalters
Copy link
Member Author

I don't think we need to worry too much about FAH; we just don't ship this in f29 right? (Though I did a quick test and it builds fine)

I've been testing FSB29 with this effectively by using my branch to make it build with cosa (and that includes running it, in fact the desktop I'm typing this from was built that way, although later rebased to the f30 ref not built via unified core).

I think you're right that the rebase is a good test. I'll do that, and also look at the filesystem-level difference.

The thing that's striking though is just how much nicer cosa is to use than raw rpm-ostree...going back to the past where you init repos by hand, the configs are JSON, there's no handy run verb...we've come far!

@cgwalters
Copy link
Member Author

OK the filesystem level diff (from non-unified ➡️ unified) shows some likely issues, here's the abbreviated version. Full version.

Mainly it looks like we for some reason gain docs, and we're not using the workstation presets, note D /usr/lib/systemd/system-preset/80-workstation.preset drops out.

M    /usr/bin
M    /usr/etc/gshadow
M    /usr/etc/shadow
M    /usr/etc/dconf/db/site
M    /usr/etc/pki/ca-trust/extracted/java/cacerts
M    /usr/lib
M    /usr/lib/os-release
M    /usr/lib/games
M    /usr/lib/modules/4.18.16-300.fc29.x86_64/initramfs.img
M    /usr/lib/os.release.d/os-release-workstation
M    /usr/lib/ostree-boot
M    /usr/lib/python3.7/site-packages/enchant/__pycache__/__init__.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/enchant/__pycache__/_enchant.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/enchant/__pycache__/errors.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/enchant/__pycache__/pypwl.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/enchant/__pycache__/utils.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/xdg/__pycache__/BaseDirectory.cpython-37.pyc
M    /usr/lib/python3.7/site-packages/xdg/__pycache__/__init__.cpython-37.pyc
M    /usr/lib/sse2
M    /usr/lib/sysimage/rpm-ostree-base-db/Basenames
M    /usr/lib/sysimage/rpm-ostree-base-db/Conflictname
M    /usr/lib/sysimage/rpm-ostree-base-db/Dirnames
M    /usr/lib/sysimage/rpm-ostree-base-db/Enhancename
M    /usr/lib/sysimage/rpm-ostree-base-db/Filetriggername
M    /usr/lib/sysimage/rpm-ostree-base-db/Group
M    /usr/lib/sysimage/rpm-ostree-base-db/Installtid
M    /usr/lib/sysimage/rpm-ostree-base-db/Name
M    /usr/lib/sysimage/rpm-ostree-base-db/Obsoletename
M    /usr/lib/sysimage/rpm-ostree-base-db/Packages
M    /usr/lib/sysimage/rpm-ostree-base-db/Providename
M    /usr/lib/sysimage/rpm-ostree-base-db/Recommendname
M    /usr/lib/sysimage/rpm-ostree-base-db/Requirename
M    /usr/lib/sysimage/rpm-ostree-base-db/Sha1header
M    /usr/lib/sysimage/rpm-ostree-base-db/Sigmd5
M    /usr/lib/sysimage/rpm-ostree-base-db/Suggestname
M    /usr/lib/sysimage/rpm-ostree-base-db/Supplementname
M    /usr/lib/sysimage/rpm-ostree-base-db/Transfiletriggername
M    /usr/lib/sysimage/rpm-ostree-base-db/Triggername
M    /usr/lib/tmpfiles.d/rpm-ostree-1-autovar.conf
M    /usr/lib64
M    /usr/lib64/X11
M    /usr/lib64/games
M    /usr/lib64/gconv/gconv-modules.cache
M    /usr/lib64/pm-utils
M    /usr/lib64/pm-utils/module.d
M    /usr/lib64/pm-utils/power.d
M    /usr/lib64/pm-utils/sleep.d
M    /usr/lib64/python3.7/__pycache__/__future__.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/_collections_abc.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/_compression.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/_sitebuiltins.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/_weakrefset.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/abc.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/argparse.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/bisect.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/bz2.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/codecs.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/contextlib.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/copy.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/copyreg.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/datetime.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/difflib.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/enum.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/fnmatch.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/functools.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/genericpath.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/getopt.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/gettext.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/glob.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/gzip.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/hashlib.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/heapq.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/io.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/keyword.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/linecache.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/locale.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/lzma.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/operator.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/optparse.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/os.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/pkgutil.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/posixpath.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/random.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/re.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/reprlib.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/selectors.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/shutil.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/signal.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/site.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/socket.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/sre_compile.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/sre_constants.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/sre_parse.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/stat.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/string.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/struct.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/subprocess.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/tempfile.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/textwrap.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/threading.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/token.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/tokenize.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/traceback.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/types.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/warnings.cpython-37.pyc
M    /usr/lib64/python3.7/__pycache__/weakref.cpython-37.pyc
M    /usr/lib64/python3.7/collections/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/collections/__pycache__/abc.cpython-37.pyc
M    /usr/lib64/python3.7/ctypes/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/ctypes/__pycache__/_endian.cpython-37.pyc
M    /usr/lib64/python3.7/ctypes/__pycache__/util.cpython-37.pyc
M    /usr/lib64/python3.7/distutils/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/distutils/__pycache__/version.cpython-37.pyc
M    /usr/lib64/python3.7/encodings/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/encodings/__pycache__/aliases.cpython-37.pyc
M    /usr/lib64/python3.7/encodings/__pycache__/latin_1.cpython-37.pyc
M    /usr/lib64/python3.7/encodings/__pycache__/utf_8.cpython-37.pyc
M    /usr/lib64/python3.7/html/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/html/__pycache__/entities.cpython-37.pyc
M    /usr/lib64/python3.7/importlib/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/importlib/__pycache__/abc.cpython-37.pyc
M    /usr/lib64/python3.7/importlib/__pycache__/machinery.cpython-37.pyc
M    /usr/lib64/python3.7/importlib/__pycache__/util.cpython-37.pyc
M    /usr/lib64/python3.7/json/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/json/__pycache__/decoder.cpython-37.pyc
M    /usr/lib64/python3.7/json/__pycache__/encoder.cpython-37.pyc
M    /usr/lib64/python3.7/json/__pycache__/scanner.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_compat.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_constants.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_error.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_gtktemplate.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_option.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_ossighelper.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_propertyhelper.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/_signalhelper.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/docstring.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/importer.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/module.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/__pycache__/types.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/GLib.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/GObject.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/Gdk.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/GdkPixbuf.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/Gio.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/Gtk.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/IBus.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/Pango.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/overrides/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/site-packages/gi/repository/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/sqlite3/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/sqlite3/__pycache__/dbapi2.cpython-37.pyc
M    /usr/lib64/python3.7/xml/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/python3.7/xml/etree/__pycache__/ElementPath.cpython-37.pyc
M    /usr/lib64/python3.7/xml/etree/__pycache__/ElementTree.cpython-37.pyc
M    /usr/lib64/python3.7/xml/etree/__pycache__/__init__.cpython-37.pyc
M    /usr/lib64/sse2
M    /usr/lib64/tls
M    /usr/sbin
M    /usr/share/empty
M    /usr/share/fonts/.uuid
M    /usr/share/fonts/aajohan-comfortaa/.uuid
M    /usr/share/fonts/cantarell/.uuid
M    /usr/share/fonts/dejavu/.uuid
M    /usr/share/fonts/gdouros-symbola/.uuid
M    /usr/share/fonts/gnu-free/.uuid
M    /usr/share/fonts/google-droid/.uuid
M    /usr/share/fonts/google-noto/.uuid
M    /usr/share/fonts/google-noto-cjk/.uuid
M    /usr/share/fonts/google-noto-emoji/.uuid
M    /usr/share/fonts/jomolhari/.uuid
M    /usr/share/fonts/julietaula-montserrat/.uuid
M    /usr/share/fonts/khmeros/.uuid
M    /usr/share/fonts/liberation/.uuid
M    /usr/share/fonts/lohit-assamese/.uuid
M    /usr/share/fonts/lohit-bengali/.uuid
M    /usr/share/fonts/lohit-devanagari/.uuid
M    /usr/share/fonts/lohit-gujarati/.uuid
M    /usr/share/fonts/lohit-gurmukhi/.uuid
M    /usr/share/fonts/lohit-kannada/.uuid
M    /usr/share/fonts/lohit-odia/.uuid
M    /usr/share/fonts/lohit-tamil/.uuid
M    /usr/share/fonts/lohit-telugu/.uuid
M    /usr/share/fonts/paktype-naskh-basic/.uuid
M    /usr/share/fonts/paratype-pt-sans/.uuid
M    /usr/share/fonts/sil-abyssinica/.uuid
M    /usr/share/fonts/sil-mingzat/.uuid
M    /usr/share/fonts/sil-nuosu/.uuid
M    /usr/share/fonts/sil-padauk/.uuid
M    /usr/share/fonts/smc/.uuid
M    /usr/share/fonts/stix/.uuid
M    /usr/share/fonts/thai-scalable/.uuid
M    /usr/share/fonts/urw-base35/.uuid
M    /usr/share/ibus-typing-booster/engine/__pycache__/factory.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/hunspell_suggest.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/hunspell_table.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/itb_emoji.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/itb_util.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/m17n_translit.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/tabsqlitedb.cpython-37.pyc
M    /usr/share/ibus-typing-booster/engine/__pycache__/version.cpython-37.pyc
M    /usr/share/icons/gnome/icon-theme.cache
M    /usr/share/polkit-1/rules.d
M    /usr/share/rpm/Basenames
M    /usr/share/rpm/Conflictname
M    /usr/share/rpm/Dirnames
M    /usr/share/rpm/Enhancename
M    /usr/share/rpm/Filetriggername
M    /usr/share/rpm/Group
M    /usr/share/rpm/Installtid
M    /usr/share/rpm/Name
M    /usr/share/rpm/Obsoletename
M    /usr/share/rpm/Packages
M    /usr/share/rpm/Providename
M    /usr/share/rpm/Recommendname
M    /usr/share/rpm/Requirename
M    /usr/share/rpm/Sha1header
M    /usr/share/rpm/Sigmd5
M    /usr/share/rpm/Suggestname
M    /usr/share/rpm/Supplementname
M    /usr/share/rpm/Transfiletriggername
M    /usr/share/rpm/Triggername
D    /usr/etc/alsa/state-daemon.conf
D    /usr/etc/alternatives/ifdown
D    /usr/etc/alternatives/ifup
D    /usr/etc/dnf
D    /usr/etc/systemd/system/multi-user.target.wants/nfs-client.target
D    /usr/etc/systemd/system/printer.target.wants
D    /usr/etc/systemd/system/remote-fs.target.wants
D    /usr/lib/variant
D    /usr/lib/cups/backend/smb
D    /usr/lib/debug/bin
D    /usr/lib/debug/lib
D    /usr/lib/debug/lib64
D    /usr/lib/debug/sbin
D    /usr/lib/debug/usr
D    /usr/lib/fontconfig/cache/04372a89-9fb2-4b6c-84e1-aee12bb3e2d3-le64.cache-7
D    /usr/lib/fontconfig/cache/08e8d327-299a-4d03-b4b7-5ed5b62148a5-le64.cache-7
D    /usr/lib/fontconfig/cache/0a610cde-2b52-4a81-8fe5-b23a560dc826-le64.cache-7
D    /usr/lib/fontconfig/cache/1f3e7b93-453d-4780-a97a-3ae822eb31db-le64.cache-7
D    /usr/lib/fontconfig/cache/20fdecd2-dae6-454e-a1a8-1457930dce94-le64.cache-7
D    /usr/lib/fontconfig/cache/21cdef64-4106-4539-88e8-140413606c20-le64.cache-7
D    /usr/lib/fontconfig/cache/22ef8043-d51f-40ad-b08a-fade3bea23c0-le64.cache-7
D    /usr/lib/fontconfig/cache/2a8d0cfe-b41d-4652-aff1-3e14faec895f-le64.cache-7
D    /usr/lib/fontconfig/cache/368900ed-2b7f-44c3-b363-75c94ffd640c-le64.cache-7
D    /usr/lib/fontconfig/cache/3744bde9-6d73-4505-a950-7a588edc277f-le64.cache-7
D    /usr/lib/fontconfig/cache/3887fc67-213c-42f2-9c4e-0e5e3b44f475-le64.cache-7
D    /usr/lib/fontconfig/cache/402088a0-33df-4e03-b2b0-8a372a1a44a5-le64.cache-7
D    /usr/lib/fontconfig/cache/4bb6d7e4-6679-4539-ae8c-fae8b776fc00-le64.cache-7
D    /usr/lib/fontconfig/cache/5dee4bf2-fca2-4f03-90ff-66606c44c0aa-le64.cache-7
D    /usr/lib/fontconfig/cache/5e04de0e-71ee-44c6-931c-fea9f73f2f9b-le64.cache-7
D    /usr/lib/fontconfig/cache/61f0e02d-cef3-4363-bbd4-09dbc76720ee-le64.cache-7
D    /usr/lib/fontconfig/cache/7137a331-0e89-4dfe-882d-841af4e0fe1c-le64.cache-7
D    /usr/lib/fontconfig/cache/78d2c772-097d-48c4-bb9b-ee9ae7544f37-le64.cache-7
D    /usr/lib/fontconfig/cache/8d2f2424-0d52-4478-9b38-fac452c0005b-le64.cache-7
D    /usr/lib/fontconfig/cache/a11cdc87-a7a9-405a-9514-4943f3041241-le64.cache-7
D    /usr/lib/fontconfig/cache/ae1d0315-ff21-4447-99f3-5f5639fa7586-le64.cache-7
D    /usr/lib/fontconfig/cache/b469e24d-c795-4505-b337-4bad526e03fb-le64.cache-7
D    /usr/lib/fontconfig/cache/b9ab4074-1dda-4a78-90d4-863d55b448ae-le64.cache-7
D    /usr/lib/fontconfig/cache/ba0147fe-d7e1-4c35-84ce-7dda9aa40456-le64.cache-7
D    /usr/lib/fontconfig/cache/bb1fbd15-35a5-4f45-8e89-c0982f873d39-le64.cache-7
D    /usr/lib/fontconfig/cache/bfd85cc9-b554-4f34-bfa4-f1ec75ff60ab-le64.cache-7
D    /usr/lib/fontconfig/cache/c8a62f2d-2121-4913-ba73-8a51233bcc19-le64.cache-7
D    /usr/lib/fontconfig/cache/cd09bccf-d364-4eb8-9cae-6e9e81493ce3-le64.cache-7
D    /usr/lib/fontconfig/cache/d02b99ae-2376-43c2-9d00-4eecc104bbd0-le64.cache-7
D    /usr/lib/fontconfig/cache/d17c26d4-cfae-4a1a-843f-503ac4bcb149-le64.cache-7
D    /usr/lib/fontconfig/cache/db8ca3f3-312e-4546-949d-3a43448b52c9-le64.cache-7
D    /usr/lib/fontconfig/cache/e1519ca2-d3b2-4842-a4bc-fb9af7cb7269-le64.cache-7
D    /usr/lib/fontconfig/cache/e9eb75be-d91c-486e-9017-8e85a982706b-le64.cache-7
D    /usr/lib/fontconfig/cache/f6065a7f-f30a-408b-aa23-2842395f2cca-le64.cache-7
D    /usr/lib/kernel/install.d/00-rpmostree-skip.install
D    /usr/lib/ostree-boot/initramfs-4.18.16-300.fc29.x86_64.img-ee4e7ba0e7170636a412a55daf7ee2ef9a6406758d02952ff67fc1947f6934b8
D    /usr/lib/ostree-boot/vmlinuz-4.18.16-300.fc29.x86_64-ee4e7ba0e7170636a412a55daf7ee2ef9a6406758d02952ff67fc1947f6934b8
D    /usr/lib/systemd/system-preset/80-workstation.preset
D    /usr/sbin/ifdown
D    /usr/sbin/ifup
A    /usr/etc/selinux/final
A    /usr/etc/systemd/system/multi-user.target.wants/sshd.service
A    /usr/lib/alternatives/cifs-idmap-plugin
A    /usr/lib/alternatives/cups_backend_smb
A    /usr/lib/alternatives/ebtables
A    /usr/lib/alternatives/iptables
A    /usr/lib/alternatives/ld
A    /usr/lib/alternatives/libnssckbi.so.x86_64
A    /usr/lib/alternatives/libwbclient.so.0.14-64
A    /usr/lib/alternatives/modules.sh
A    /usr/lib/alternatives/print
A    /usr/lib/alternatives/qtchooser-4
A    /usr/lib/alternatives/qtchooser-5
A    /usr/lib/alternatives/qtchooser-default
A    /usr/lib/alternatives/xinputrc
A    /usr/lib/fontconfig/cache/00d9a8da-d8fb-471c-b94f-d6fbd80e70ca-le64.cache-7
A    /usr/lib/fontconfig/cache/04cda77a-e6bd-4a9a-a3c6-fa50ad25a6d4-le64.cache-7
A    /usr/lib/fontconfig/cache/1c1976b2-225e-4622-ba7e-78f0afd566ab-le64.cache-7
A    /usr/lib/fontconfig/cache/1d92bcad-e458-4a40-bc30-dbd02c285bdf-le64.cache-7
A    /usr/lib/fontconfig/cache/29d52ba8-6cef-4585-8068-ed68efa57d8b-le64.cache-7
A    /usr/lib/fontconfig/cache/2a526843-586a-415a-b706-00fdc57311c3-le64.cache-7
A    /usr/lib/fontconfig/cache/51e372a6-2f22-4fee-ab33-cc44a8a11869-le64.cache-7
A    /usr/lib/fontconfig/cache/57bcb7c4-f001-4f7b-9947-ae233d8af66c-le64.cache-7
A    /usr/lib/fontconfig/cache/6521dbce-6511-486a-b852-1e7de0bc6380-le64.cache-7
A    /usr/lib/fontconfig/cache/71399b27-6d31-4625-b45a-8775efe7af47-le64.cache-7
A    /usr/lib/fontconfig/cache/779c99db-8be3-46ab-88cc-cf46ceb4ed16-le64.cache-7
A    /usr/lib/fontconfig/cache/7c905a04-2345-410a-bd14-f42310c446ee-le64.cache-7
A    /usr/lib/fontconfig/cache/800f92e6-c2a0-4ecc-9829-7e7d0c6fa37d-le64.cache-7
A    /usr/lib/fontconfig/cache/973e1a5d-a295-4efa-90b0-8e6c2b92f2ff-le64.cache-7
A    /usr/lib/fontconfig/cache/9a0e0f81-653a-4328-96ef-ca67f300a6ad-le64.cache-7
A    /usr/lib/fontconfig/cache/9d790ab6-c974-410e-be52-a671c5cbd802-le64.cache-7
A    /usr/lib/fontconfig/cache/b7a1420e-aef6-4c51-957d-2c24685826ab-le64.cache-7
A    /usr/lib/fontconfig/cache/ba0e6c8a-7e53-44c8-922e-8988758d9a5b-le64.cache-7
A    /usr/lib/fontconfig/cache/bdefe169-0884-44ec-8911-2567e1515641-le64.cache-7
A    /usr/lib/fontconfig/cache/c983cdf1-9f62-45b5-bb0f-898758f2afa9-le64.cache-7
A    /usr/lib/fontconfig/cache/cd43bfca-2762-4e16-a69e-63f3fe5fe3e4-le64.cache-7
A    /usr/lib/fontconfig/cache/ce989d24-5598-4df3-8364-a02f28fe2720-le64.cache-7
A    /usr/lib/fontconfig/cache/df370295-2b6a-4c3c-bcfd-3255d3c5e610-le64.cache-7
A    /usr/lib/fontconfig/cache/e14bf9aa-3928-485d-b7cb-f920174f9c1c-le64.cache-7
A    /usr/lib/fontconfig/cache/e3075c33-72ee-4851-9fa8-656aae086167-le64.cache-7
A    /usr/lib/fontconfig/cache/e334295f-8a42-4c42-843e-081ee514b905-le64.cache-7
A    /usr/lib/fontconfig/cache/e9895aa4-a66a-436b-b50f-28a71ca1717e-le64.cache-7
A    /usr/lib/fontconfig/cache/f082426e-4b07-4d43-8fb5-3e5e9f10b54c-le64.cache-7
A    /usr/lib/fontconfig/cache/f1394682-6106-404d-a862-f7a86ff7ed9c-le64.cache-7
A    /usr/lib/fontconfig/cache/f7bc448e-ca0d-4a35-a56b-cc99e2f12b06-le64.cache-7
A    /usr/lib/fontconfig/cache/f94d1736-ac00-43d8-be8a-ed49f7993b2c-le64.cache-7
A    /usr/lib/fontconfig/cache/f99ca8b2-35c5-4497-a0da-6d7df3e98f07-le64.cache-7
A    /usr/lib/fontconfig/cache/facdbbf7-32b4-4844-81ce-1ccd8706f9be-le64.cache-7
A    /usr/lib/ostree-boot/initramfs-4.18.16-300.fc29.x86_64.img-194a7507018c19ae555798d86636c303083a22d038513141f5ae0113109c0187
A    /usr/lib/ostree-boot/vmlinuz-4.18.16-300.fc29.x86_64-194a7507018c19ae555798d86636c303083a22d038513141f5ae0113109c0187
A    /usr/lib/ostree-boot/loader
A    /usr/lib/ostree-boot/loader/entries
A    /usr/lib/tmpfiles.d/pkg-NetworkManager.conf
A    /usr/lib/tmpfiles.d/pkg-xorg-x11-server-common.conf
A    /usr/lib64/firefox/langpacks
A    /usr/lib64/firefox/langpacks/langpack-ach@firefox.mozilla.org.xpi
A    /usr/share/doc/marisa/readme.ja.html
A    /usr/share/locale/ca/cups_ca.po
A    /usr/share/locale/ca/gutenprint_ca.po
A    /usr/share/locale/ca/LC_MESSAGES
A    /usr/share/locale/ca/LC_MESSAGES/GConf2.mo
A    /usr/share/locale/ca/LC_MESSAGES/Linux-PAM.mo
A    /usr/share/man/ru/man1/apropos.1.gz
A    /usr/share/man/zh_TW/man8/usermod.8.gz
A    /usr/share/qt4
A    /usr/share/qt4/translations
A    /usr/share/qt4/translations/assistant_cs.qm
A    /usr/share/qt4/translations/qtscript_eu.qm

@jlebon
Copy link
Member

jlebon commented Mar 25, 2019

The filesystem diff is a good idea!

I don't think we need to worry too much about FAH; we just don't ship this in f29 right? (Though I did a quick test and it builds fine)

We still have a lot of f29 consumers though (i.e. SB, FCOS, cosa). I'd like to keep releasing there until at least FCOS and cosa are bumped. (Though one way out would be to use the Koji tag Dusty is setting up so we can just build the latest there).

@dustymabe
Copy link
Member

@cgwalters
I don't think we need to worry too much about FAH; we just don't ship this in f29 right? (Though I did a quick test and it builds fine)

Meaning we never update rpm-ostree again in f29? We are planning to continue to ship f29AH until f29 EOL (i.e. no F30 atomic host, and FCOS just in preview) so that might cause pain if we maintain a diff between f29 and latest.

@jlebon
We still have a lot of f29 consumers though (i.e. SB, FCOS, cosa). I'd like to keep releasing there until at least FCOS and cosa are bumped. (Though one way out would be to use the Koji tag Dusty is setting up so we can just build the latest there).

yeah I was going to suggest once beta f30 lands for us to switch over. Would also be nice if we managed to get rid of anaconda first before we switch to f30 so we don't have to deal with "anaconda differences" between f29 and f30. One that I know of is that installclass is no longer supported.

@cgwalters cgwalters force-pushed the unified-only branch 3 times, most recently from fc87031 to ed1441f Compare March 26, 2019 20:40
@cgwalters
Copy link
Member Author

Whee, now passing all tests.

I'll look at a PR to fix the Workstation 29 presets. And I'll take a look at the filesystem-level diff for AH.

Would also be nice if we managed to get rid of anaconda first before we switch to f30 so we don't have to deal with "anaconda differences" between f29 and f30. One that I know of is that installclass is no longer supported.

I am not aware of a way in which Anaconda intersects with this. It's not impossible but did you have something in mind?

@cgwalters
Copy link
Member Author

We still have a lot of f29 consumers though (i.e. SB, FCOS, cosa). I'd like to keep releasing there until at least FCOS and cosa are bumped.

Fair. No reason not to bump fcos right now right? For cosa hmm, yes we should try it.

@dustymabe
Copy link
Member

Would also be nice if we managed to get rid of anaconda first before we switch to f30 so we don't have to deal with "anaconda differences" between f29 and f30. One that I know of is that installclass is no longer supported.

I am not aware of a way in which Anaconda intersects with this. It's not impossible but did you have something in mind?

I agree anaconda doesn't have implications for this suggested change. My comment was in response to @jlebon where he was talking about moving COSA/FCOS to f30. I made a similar comment over in the appropriate place now that he has opened it up over there.

@cgwalters
Copy link
Member Author

We should be able to merge this now right?

@jlebon
Copy link
Member

jlebon commented Apr 15, 2019

Did we get to the bottom of the diff on SB? Some things that jump out from a quick scan: it looks like we're losing fontconfig cache, the workstation preset (which you mentioned already, is that fixed now?), and we're enabling sshd by default?

@cgwalters
Copy link
Member Author

The fontconfig stuff varies every build I think; looks like fontconfig gives each font a local UUID for presumably bad reasons.

Anyways so I tried rebasing a sb30 build and actually it doesn't work. I think it relates to this:

grep usr/etc/systemd /srv/walters/tmp/sbdiff.txt 
D    /usr/etc/systemd/system/ctrl-alt-del.target
D    /usr/etc/systemd/system/dbus.service
D    /usr/etc/systemd/system/messagebus.service
D    /usr/etc/systemd/system/getty.target.wants
D    /usr/etc/systemd/system/multi-user.target.wants/nfs-client.target
D    /usr/etc/systemd/system/multi-user.target.wants/remote-fs.target
D    /usr/etc/systemd/system/nfs-blkmap.service.requires
D    /usr/etc/systemd/system/nfs-idmapd.service.requires
D    /usr/etc/systemd/system/nfs-mountd.service.requires
D    /usr/etc/systemd/system/nfs-server.service.requires
D    /usr/etc/systemd/system/printer.target.wants
D    /usr/etc/systemd/system/remote-fs.target.wants
D    /usr/etc/systemd/system/rpc-gssd.service.requires
D    /usr/etc/systemd/system/rpc-statd-notify.service.requires
D    /usr/etc/systemd/system/rpc-statd.service.requires
D    /usr/etc/systemd/user/dbus.service
A    /usr/etc/systemd/system/dbus-org.freedesktop.network1.service
A    /usr/etc/systemd/system/dbus-org.freedesktop.resolve1.service

Which is probably fallout from us ignoring all of the crazy systemd unit stuff going on in dbus-broker.

We still accept the `--unified-core` option, it just does
nothing.

We're talking about making 2019.2 the last release to support
RHEL7.  That makes it also a good cutover point to just drop
the non-unified-core codepath.

Since coreos-assembler defaults to it, we know it works.
I also tested Silverblue with it.

Alternative to coreos#1739
@jlebon
Copy link
Member

jlebon commented Mar 2, 2020

Probably should revisit this again and see what needs to be resolved.

@openshift-ci-robot
Copy link
Collaborator

@cgwalters: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request May 17, 2020
Start adding some pain if `--unified-core` isn't provided
to help flush out anyone relying on it.  (And I think today
pungi is not passing it, so e.g. Fedora IoT/Silverblue are impacted)

Prep for merging coreos#1793
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request May 18, 2020
Start adding some pain if `--unified-core` isn't provided
to help flush out anyone relying on it.  (And I think today
pungi is not passing it, so e.g. Fedora IoT/Silverblue are impacted)

Prep for merging coreos#1793
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request May 18, 2020
Start adding some pain if `--unified-core` isn't provided
to help flush out anyone relying on it.  (And I think today
pungi is not passing it, so e.g. Fedora IoT/Silverblue are impacted)

Prep for merging coreos#1793
cgwalters added a commit to cgwalters/rpm-ostree that referenced this pull request May 19, 2020
Start adding some pain if `--unified-core` isn't provided
to help flush out anyone relying on it.  (And I think today
pungi is not passing it, so e.g. Fedora IoT/Silverblue are impacted)

Prep for merging coreos#1793

Co-authored-by: Jonathan Lebon <jonathan@jlebon.com>
openshift-merge-robot pushed a commit that referenced this pull request May 20, 2020
Start adding some pain if `--unified-core` isn't provided
to help flush out anyone relying on it.  (And I think today
pungi is not passing it, so e.g. Fedora IoT/Silverblue are impacted)

Prep for merging #1793

Co-authored-by: Jonathan Lebon <jonathan@jlebon.com>
@openshift-ci
Copy link

openshift-ci bot commented Jun 6, 2023

@cgwalters: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/build 3b8afb7 link /test build
ci/prow/unit 3b8afb7 link /test unit
ci/prow/build-clang 3b8afb7 link true /test build-clang
ci/prow/images 3b8afb7 link true /test images
ci/prow/clang-analyzer 3b8afb7 link true /test clang-analyzer
ci/prow/fcos-e2e 3b8afb7 link true /test fcos-e2e
ci/prow/kola-upgrade 3b8afb7 link true /test kola-upgrade

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants