Merge pull request #179 from openshift-cherrypick-robot/cherry-pick-176-to-v5.6

[v5.6] disable zincati OCI backend warning in MOTD

Author: openshift-merge-bot[bot]

podman-image/00-podman-machine.preset

@@ -3,6 +3,9 @@
 # Disable Root mountpoint warning on shh login
 # https://github.com/containers/podman-machine-os/issues/155
 disable coreos-warn-invalid-mounts.service
+# We don't use zincati but because we ship our own custom builds so
+# we don't care about the coreos update migration to OCI images.
+disable coreos-oci-migration-motd.service
 
 # Disable coreos chrony config, we do provide our own.
 disable coreos-platform-chrony-config.service

verify/image_test.go

@@ -160,6 +160,8 @@ var _ = Describe("run image tests", Ordered, ContinueOnFailure, func() {
 			output := sshSession.outputToString()
 			Expect(output).To(ContainSubstring("Fedora CoreOS"), "should contain FCOS motd message")
 			Expect(output).ToNot(ContainSubstring("Warning"), "no warnings in motd message seen")
+			// no coreos-oci-migration-motd.service output should be seen
+			Expect(output).ToNot(ContainSubstring("zincati"), "no zincati migrate wanring in motd message seen")
 		})
 
 		It("check systemd resolved is not in use", func() {