From 925aee97d9b36e917bf8ce2d7bd88c13ca7c23b1 Mon Sep 17 00:00:00 2001 From: Tausif Rahman Date: Wed, 18 Jan 2023 21:25:44 +0000 Subject: SERVER-72976 Get tooling metrics collection in fully working state --- etc/evergreen.yml | 1 + etc/evergreen_yml_components/definitions.yml | 13 +++++++++++++ etc/pip/components/platform.req | 2 +- etc/pip/components/tooling_metrics.req | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) (limited to 'etc') diff --git a/etc/evergreen.yml b/etc/evergreen.yml index c717d69d8c9..3e4556a74f3 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -777,6 +777,7 @@ buildvariants: - ubuntu1804-small stepback: false tasks: + - name: tooling_metrics_test - name: publish_metrics ########################################### diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index ab934c7bc13..54d445b653f 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -8050,6 +8050,19 @@ tasks: - "src/evergreen/run_python_script.sh" - "evergreen/publish_metrics.py" +- name: tooling_metrics_test + tags: [] + depends_on: [] + commands: + - *f_expansions_write + - func: "do non-compile setup" + - func: "set up remote credentials" + - *f_expansions_write + - func: "configure evergreen api credentials" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + ####################################### # Task Groups # ####################################### diff --git a/etc/pip/components/platform.req b/etc/pip/components/platform.req index af767d986ee..e971d86b552 100644 --- a/etc/pip/components/platform.req +++ b/etc/pip/components/platform.req @@ -5,5 +5,5 @@ pywin32>=225; sys_platform == "win32" and python_version > "3" cryptography == 2.3; platform_machine == "s390x" or platform_machine == "ppc64le" # Needed for oauthlib to use RSAAlgorithm # Version locked - see SERVER-36618 cryptography == 36.0.2; platform_machine != "s390x" and platform_machine != "ppc64le" -mongo-ninja-python == 1.11.1.2; platform_machine == "x86_64" and sys_platform == "linux" +mongo-ninja-python == 1.11.1.3; platform_machine == "x86_64" and sys_platform == "linux" ninja >= 1.10.0; platform_machine != "x86_64" or sys_platform != "linux" diff --git a/etc/pip/components/tooling_metrics.req b/etc/pip/components/tooling_metrics.req index 511d4047340..2346eaa1df2 100644 --- a/etc/pip/components/tooling_metrics.req +++ b/etc/pip/components/tooling_metrics.req @@ -1 +1 @@ -mongo-tooling-metrics == 1.0.5 +mongo-tooling-metrics == 1.0.6 -- cgit v1.2.1