SERVER-54315: Turn off jasper resmoke

4 files changed, 15 insertions, 16 deletions

diff --git a/buildscripts/resmokelib/core/jasper.proto b/buildscripts/resmokelib/core/jasper.proto
index 179101cdd6f..85a064755fb 100644
--- a/buildscripts/resmokelib/core/jasper.proto
+++ b/buildscripts/resmokelib/core/jasper.proto
@@ -12,10 +12,11 @@ message LoggerConfig {
     DefaultLoggerOptions default = 1;
     FileLoggerOptions file = 2;
     InheritedLoggerOptions inherited = 3;
-    InMemoryLoggerOptions in_memory = 4;
-    SplunkLoggerOptions splunk = 5;
-    BuildloggerV2Options buildloggerv2 = 6;
-    BuildloggerV3Options buildloggerv3 = 7;
+    SumoLogicLoggerOptions sumo = 4;
+    InMemoryLoggerOptions in_memory = 5;
+    SplunkLoggerOptions splunk = 6;
+    BuildloggerV2Options buildloggerv2 = 7;
+    BuildloggerV3Options buildloggerv3 = 8;
     RawLoggerConfig raw = 9;
   }
 }
@@ -59,6 +60,11 @@ message InheritedLoggerOptions {
   BaseOptions base = 1;
 }
 
+message SumoLogicLoggerOptions {
+  string sumo_endpoint = 1;
+  BaseOptions base = 2;
+}
+
 message InMemoryLoggerOptions {
   int64 in_memory_cap = 1;
   BaseOptions base = 2;
@@ -397,9 +403,10 @@ message LoggingCacheInstance {
   google.protobuf.Timestamp accessed = 4;
 }
 
-message LoggingCacheLenResponse {
+message LoggingCacheSize {
   OperationOutcome outcome = 1 ;
-  int64 len = 2;
+  string id = 2;
+  int64 size = 3;
 }
 
 enum LoggingPayloadFormat {
@@ -460,7 +467,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 (LoggingCacheLenResponse);
+  rpc LoggingCacheLen(google.protobuf.Empty) returns (LoggingCacheSize);
   rpc LoggingCachePrune(google.protobuf.Timestamp) returns (OperationOutcome);
 
   // Remote specific functions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index ba51f10304b..ba58458163d 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -9032,7 +9032,6 @@ 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:
@@ -9139,7 +9138,6 @@ 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/pip/components/resmoke.req b/etc/pip/components/resmoke.req
index c59e65ebe03..0a68e63a0cd 100644
--- a/etc/pip/components/resmoke.req
+++ b/etc/pip/components/resmoke.req
@@ -1,4 +1,4 @@
-curatorbin == 1.2.3
+curatorbin == 1.2.1
 PyKMIP == 0.4.0 # It's now 0.8.0. We're far enough back to have API conflicts.
 evergreen.py == 3.2.0
 jinja2
diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh
index 225cea691d3..d7791cc6633 100644
--- a/evergreen/resmoke_tests_execute.sh
+++ b/evergreen/resmoke_tests_execute.sh
@@ -104,11 +104,6 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then
     extra_args="$extra_args --mongodSetParameter \"{'jsHeapLimitMB':10}\""
   fi
 
-  spawn_using=${spawn_resmoke_using}
-  if [[ -z "$spawn_using" ]]; then
-    spawn_using="python"
-  fi
-
   path_value="$PATH:/data/multiversion"
 
   # The "resmoke_wrapper" expansion is used by the 'burn_in_tests' task to wrap the resmoke.py
@@ -141,7 +136,6 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then
     --taskName=${task_name} \
     --variantName=${build_variant} \
     --versionId=${version_id} \
-    --spawnUsing=$spawn_using \
     --reportFile=report.json \
     --perfReportFile=perf.json
   resmoke_exit_code=$?