diff options
author | julianedwards <julian.edwards@mongodb.com> | 2021-08-19 15:02:28 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-08-19 15:37:48 +0000 |
commit | 4febdf30b44ddebf5d238721015e5d59db663086 (patch) | |
tree | beafdd34fc9ed66636946f85a30531457a3ac6ab | |
parent | cb908c8437e2a8b189d37f44a48061364397829d (diff) | |
download | mongo-4febdf30b44ddebf5d238721015e5d59db663086.tar.gz |
SERVER-54315: Enable jasper resmoke for a single daily build
-rw-r--r-- | buildscripts/resmokelib/core/jasper.proto | 21 | ||||
-rw-r--r-- | etc/evergreen.yml | 1 | ||||
-rw-r--r-- | etc/pip/components/resmoke.req | 2 | ||||
-rw-r--r-- | evergreen/resmoke_tests_execute.sh | 6 |
4 files changed, 15 insertions, 15 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/etc/evergreen.yml b/etc/evergreen.yml index b8d12eb77e0..f499d0c8bc4 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -9004,6 +9004,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: diff --git a/etc/pip/components/resmoke.req b/etc/pip/components/resmoke.req index 0a68e63a0cd..c59e65ebe03 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.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 d7791cc6633..225cea691d3 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -104,6 +104,11 @@ 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 @@ -136,6 +141,7 @@ 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=$? |