From a9b4978c12f93c34988bdcfd1483ce2152859f3a Mon Sep 17 00:00:00 2001 From: "psmdb-bot[bot]" <2942401+psmdb-bot[bot]@users.noreply.github.com> Date: Thu, 16 Jul 2026 11:22:55 +0000 Subject: [PATCH] Resolve conflicts for merge commit 'ff39f35e4cb' into master Resolved the merge conflict in bazel/resmoke/resmoke.bzl by keeping Percona's removal of the MongoDB enterprise module jstests data dependencies. Percona (HEAD) deliberately removed all `//src/mongo/db/modules/enterprise/jstests/...` entries because PSMDB does not ship MongoDB's enterprise module. Upstream (theirs) only added new `audit/lib` entries to that same enterprise list, which are irrelevant to PSMDB, so they were dropped along with the rest. Resolved: bazel/resmoke/resmoke.bzl Note: commit created by mergai --- bazel/resmoke/resmoke.bzl | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/bazel/resmoke/resmoke.bzl b/bazel/resmoke/resmoke.bzl index c6a6a018ec5a3..7b1c7bb5b8613 100644 --- a/bazel/resmoke/resmoke.bzl +++ b/bazel/resmoke/resmoke.bzl @@ -389,28 +389,6 @@ def resmoke_suite_test( "//jstests/with_mongot:keyfile_for_testing", "//jstests/with_mongot/search_mocked/lib:all_javascript_files", "//jstests/with_mongot/search_mocked/ssl/lib:all_javascript_files", -<<<<<<< HEAD -||||||| b608b7554ca - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:all_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:ekf", - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:ekf2", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:all_files", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:all_subpackage_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:ldapmockserver", - "//src/mongo/db/modules/enterprise/jstests/hot_backups/libs:all_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/live_restore/libs:all_javascript_files", -======= - "//src/mongo/db/modules/enterprise/jstests/audit/lib:all_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/audit/lib:localKey", - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:all_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:ekf", - "//src/mongo/db/modules/enterprise/jstests/encryptdb/libs:ekf2", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:all_files", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:all_subpackage_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/external_auth/lib:ldapmockserver", - "//src/mongo/db/modules/enterprise/jstests/hot_backups/libs:all_javascript_files", - "//src/mongo/db/modules/enterprise/jstests/live_restore/libs:all_javascript_files", ->>>>>>> ff39f35e4cba1f65d72c42102cc4ddca8a8a2429 "//src/third_party/schemastore.org:schemas", "//x509:generate_main_certificates", ]