SERVER-54315: Turn on jasper resmoke for a single required build and a single daily build

7 files changed, 19 insertions, 22 deletions

diff --git a/buildscripts/resmokelib/core/jasper.proto b/buildscripts/resmokelib/core/jasper.proto
index 85a064755fb..179101cdd6f 100644
--- a/buildscripts/resmokelib/core/jasper.proto
+++ b/buildscripts/resmokelib/core/jasper.proto
@@ -12,11 +12,10 @@ message LoggerConfig {
     DefaultLoggerOptions default = 1;
     FileLoggerOptions file = 2;
     InheritedLoggerOptions inherited = 3;
-    SumoLogicLoggerOptions sumo = 4;
-    InMemoryLoggerOptions in_memory = 5;
-    SplunkLoggerOptions splunk = 6;
-    BuildloggerV2Options buildloggerv2 = 7;
-    BuildloggerV3Options buildloggerv3 = 8;
+    InMemoryLoggerOptions in_memory = 4;
+    SplunkLoggerOptions splunk = 5;
+    BuildloggerV2Options buildloggerv2 = 6;
+    BuildloggerV3Options buildloggerv3 = 7;
     RawLoggerConfig raw = 9;
   }
 }
@@ -60,11 +59,6 @@ message InheritedLoggerOptions {
   BaseOptions base = 1;
 }
 
-message SumoLogicLoggerOptions {
-  string sumo_endpoint = 1;
-  BaseOptions base = 2;
-}
-
 message InMemoryLoggerOptions {
   int64 in_memory_cap = 1;
   BaseOptions base = 2;
@@ -403,10 +397,9 @@ message LoggingCacheInstance {
   google.protobuf.Timestamp accessed = 4;
 }
 
-message LoggingCacheSize {
+message LoggingCacheLenResponse {
   OperationOutcome outcome = 1 ;
-  string id = 2;
-  int64 size = 3;
+  int64 len = 2;
 }
 
 enum LoggingPayloadFormat {
@@ -467,7 +460,7 @@ service JasperProcessManager {
   rpc LoggingCacheRemove(LoggingCacheArgs) returns (OperationOutcome);
   rpc LoggingCacheCloseAndRemove(LoggingCacheArgs) returns (OperationOutcome);
   rpc LoggingCacheClear(google.protobuf.Empty) returns (OperationOutcome);
-  rpc LoggingCacheLen(google.protobuf.Empty) returns (LoggingCacheSize);
+  rpc LoggingCacheLen(google.protobuf.Empty) returns (LoggingCacheLenResponse);
   rpc LoggingCachePrune(google.protobuf.Timestamp) returns (OperationOutcome);
 
   // Remote specific functions
diff --git a/buildscripts/resmokelib/testing/hooks/jsfile.py b/buildscripts/resmokelib/testing/hooks/jsfile.py
index 1075cb26ac4..9e39057314e 100644
--- a/buildscripts/resmokelib/testing/hooks/jsfile.py
+++ b/buildscripts/resmokelib/testing/hooks/jsfile.py
@@ -64,7 +64,7 @@ class DynamicJSTestCase(interface.DynamicTestCase):
         """Initialize DynamicJSTestCase."""
         interface.DynamicTestCase.__init__(self, logger, test_name, description, base_test_name,
                                            hook)
-        self._js_test_builder = jstest.JSTestCaseBuilder(logger, js_filename, self.id,
+        self._js_test_builder = jstest.JSTestCaseBuilder(logger, js_filename, self.id(),
                                                          shell_options=shell_options)
         self._js_test_case = None
 
diff --git a/buildscripts/resmokelib/testing/testcases/jstest.py b/buildscripts/resmokelib/testing/testcases/jstest.py
index ccd5b4db5cd..b79cbb53d4f 100644
--- a/buildscripts/resmokelib/testing/testcases/jstest.py
+++ b/buildscripts/resmokelib/testing/testcases/jstest.py
@@ -22,7 +22,7 @@ class _SingleJSTestCase(interface.ProcessTestCase):
 
     REGISTERED_NAME = registry.LEAVE_UNREGISTERED
 
-    def __init__(self, logger, js_filename, test_id, shell_executable=None, shell_options=None):  # pylint: disable=too-many-arguments
+    def __init__(self, logger, js_filename, _id, shell_executable=None, shell_options=None):  # pylint: disable=too-many-arguments
         """Initialize the _SingleJSTestCase with the JS file to run."""
         interface.ProcessTestCase.__init__(self, logger, "JSTest", js_filename)
 
@@ -30,7 +30,7 @@ class _SingleJSTestCase(interface.ProcessTestCase):
         self.shell_executable = utils.default_if_none(config.MONGO_EXECUTABLE, shell_executable)
 
         self.js_filename = js_filename
-        self.test_id = test_id
+        self._id = _id
         self.shell_options = utils.default_if_none(shell_options, {}).copy()
 
     def configure(self, fixture, *args, **kwargs):
@@ -109,9 +109,9 @@ class _SingleJSTestCase(interface.ProcessTestCase):
 
     def _make_process(self):
         return core.programs.mongo_shell_program(
-            self.logger, self.fixture.job_num, test_id=self.test_id,
-            executable=self.shell_executable, filename=self.js_filename,
-            connection_string=self.fixture.get_driver_connection_url(), **self.shell_options)
+            self.logger, self.fixture.job_num, test_id=self._id, executable=self.shell_executable,
+            filename=self.js_filename, connection_string=self.fixture.get_driver_connection_url(),
+            **self.shell_options)
 
 
 class JSTestCaseBuilder:
@@ -157,7 +157,7 @@ class JSTestCaseBuilder:
 
         shell_options = self._get_shell_options_for_thread(num_clients, thread_id)
         test_case = _SingleJSTestCase(logger, self.test_case_template.js_filename,
-                                      self.test_case_template.id,
+                                      self.test_case_template.id(),
                                       self.test_case_template.shell_executable, shell_options)
 
         test_case.configure(self.test_case_template.fixture)
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 08ef2e878a1..fda47b1383d 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9211,6 +9211,7 @@ buildvariants:
     target_resmoke_time: 10
     max_sub_suites: 3
     large_distro_name: rhel80-medium
+    spawn_resmoke_using: jasper
   tasks:
   - name: compile_test_and_package_serial_TG
     distros:
@@ -9318,6 +9319,7 @@ buildvariants:
     large_distro_name: rhel80-medium
     burn_in_tag_buildvariants: enterprise-rhel-80-64-bit-inmem linux-64-duroff enterprise-rhel-80-64-bit-multiversion
     num_scons_link_jobs_available: 0.99
+    spawn_resmoke_using: jasper
   tasks:
   - name: compile_test_and_package_parallel_core_stream_TG
     distros:
diff --git a/etc/expansions.default.yml b/etc/expansions.default.yml
index 2ddbe84a0c6..8a0a99ecda9 100644
--- a/etc/expansions.default.yml
+++ b/etc/expansions.default.yml
@@ -30,6 +30,7 @@ content_type: application/x-gzip
 jstestfuzz_concurrent_num_files: "10"
 curator_release: "latest"
 ext: tgz
+spawn_resmoke_using: "python"
 
 # SCons compile expansions.
 compiling_for_test: "false"
diff --git a/etc/pip/components/resmoke.req b/etc/pip/components/resmoke.req
index c16213fee98..0e4a70cbb65 100644
--- a/etc/pip/components/resmoke.req
+++ b/etc/pip/components/resmoke.req
@@ -1,4 +1,4 @@
-curatorbin == 1.2.1
+curatorbin == 1.2.3
 PyKMIP == 0.10.0
 evergreen.py == 3.2.0
 jinja2
diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh
index d7791cc6633..2756dbe7637 100644
--- a/evergreen/resmoke_tests_execute.sh
+++ b/evergreen/resmoke_tests_execute.sh
@@ -136,6 +136,7 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then
     --taskName=${task_name} \
     --variantName=${build_variant} \
     --versionId=${version_id} \
+    --spawnUsing=${spawn_resmoke_using} \
     --reportFile=report.json \
     --perfReportFile=perf.json
   resmoke_exit_code=$?