From 46e7d0c2efcf8f5c181115b8181c3dd9cd9a2f00 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <mnguyen@redhat.com>
Date: Tue, 24 May 2022 23:05:16 -0400
Subject: [PATCH] tests: fix /var race in multipath.partition part 2

This fixes the same race condition in a previous PR #2457 [0]. The
difference is that in PR #2758 [1], `mpath-var-lib-containers.service`
uses mkdir to create `/var/lib/containers` and in some cases it will race
against `ostree-remount.service` during the short window `/var` is
read-only. Have `mpath-var-lib-containers.service` run after
`ostree-remount.service` to resolve this.

[0] https://github.com/coreos/coreos-assembler/pull/2457
[1] https://github.com/coreos/coreos-assembler/pull/2758
---
 mantle/kola/tests/misc/multipath.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mantle/kola/tests/misc/multipath.go b/mantle/kola/tests/misc/multipath.go
index 5c9c865faf..a31dfc5cce 100644
--- a/mantle/kola/tests/misc/multipath.go
+++ b/mantle/kola/tests/misc/multipath.go
@@ -62,6 +62,9 @@ systemd:
         ConditionFirstBoot=true
         Requires=dev-mapper-mpatha.device
         After=dev-mapper-mpatha.device
+        # See https://github.com/coreos/coreos-assembler/pull/2457
+        # and https://github.com/openshift/os/issues/743
+        After=ostree-remount.service
         Before=kubelet.service
         DefaultDependencies=no
 
@@ -78,8 +81,6 @@ systemd:
       contents: |
         [Unit]
         Description=Mount /var/lib/containers
-        # See https://github.com/coreos/coreos-assembler/pull/2457
-        After=ostree-remount.service
         After=mpath-var-lib-containers.service
         Before=kubelet.service