From 7e460e7d5a9540d2892562c61d21de080bc10b36 Mon Sep 17 00:00:00 2001
From: Sandra Romanchenko <53295797+sandraromanchenko@users.noreply.github.com>
Date: Wed, 21 Feb 2024 09:36:06 +0200
Subject: [PATCH] PBM tests. Set proper user on container re-creation, include
 pbmLockOp for lock check (#908)

---
 e2e-tests/functions             | 3 ++-
 e2e-tests/pkg/pbm/clock_skew.go | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/e2e-tests/functions b/e2e-tests/functions
index 5685edfdd..828655d1f 100644
--- a/e2e-tests/functions
+++ b/e2e-tests/functions
@@ -112,12 +112,13 @@ wait_noop() {
     set +o xtrace
 
     retry=0
-    until [ "$(mongo_run 'db.getSiblingDB("admin").pbmLock.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ]; do
+    until [ "$(mongo_run 'db.getSiblingDB("admin").pbmLock.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ] && [ "$(mongo_run 'db.getSiblingDB("admin").pbmLockOp.find().count()' cfg | tail -n 1 | tr -d '\r')" == 0 ]; do
         sleep 1
         echo -n .
         let retry+=1
         if [ $retry -ge 120 ]; then
             mongo_run 'db.getSiblingDB("admin").pbmLock.find()' "cfg"
+            mongo_run 'db.getSiblingDB("admin").pbmLockOp.find()' "cfg"
             exit 1
         fi
     done
diff --git a/e2e-tests/pkg/pbm/clock_skew.go b/e2e-tests/pkg/pbm/clock_skew.go
index bb9e8d395..eeef579a0 100644
--- a/e2e-tests/pkg/pbm/clock_skew.go
+++ b/e2e-tests/pkg/pbm/clock_skew.go
@@ -55,6 +55,7 @@ func ClockSkew(rsName, ts, dockerHost string) error {
 			Env:    envs,
 			Cmd:    []string{"pbm-agent"},
 			Labels: containerOld.Config.Labels,
+			User: "1001",
 		},
 			containerOld.HostConfig,
 			&network.NetworkingConfig{