Skip to content

Commit 0e33e17

Browse files
committed
Fix config
1 parent 229bc04 commit 0e33e17

File tree

4 files changed

+43
-5
lines changed

4 files changed

+43
-5
lines changed

.evergreen/generated_configs/functions.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,17 @@ functions:
168168
args:
169169
- .evergreen/scripts/perf-submission-setup.sh
170170
working_dir: src
171+
include_expansions_in_env:
172+
- requester
173+
- revision_order_id
174+
- project_id
175+
- version_id
176+
- build_variant
177+
- parsed_order_id
178+
- task_name
179+
- task_id
180+
- execution
181+
- is_mainline
171182
type: test
172183
- command: expansions.update
173184
params:
@@ -178,6 +189,17 @@ functions:
178189
args:
179190
- .evergreen/scripts/perf-submission.sh
180191
working_dir: src
192+
include_expansions_in_env:
193+
- requester
194+
- revision_order_id
195+
- project_id
196+
- version_id
197+
- build_variant
198+
- parsed_order_id
199+
- task_name
200+
- task_id
201+
- execution
202+
- is_mainline
181203
type: test
182204

183205
# Setup system

.evergreen/scripts/generate_config.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,10 +1102,26 @@ def create_attach_benchmark_test_results_func():
11021102

11031103

11041104
def create_send_dashboard_data_func():
1105+
includes = [
1106+
"requester",
1107+
"revision_order_id",
1108+
"project_id",
1109+
"version_id",
1110+
"build_variant",
1111+
"parsed_order_id",
1112+
"task_name",
1113+
"task_id",
1114+
"execution",
1115+
"is_mainline",
1116+
]
11051117
cmds = [
1106-
get_subprocess_exec(args=[".evergreen/scripts/perf-submission-setup.sh"]),
1118+
get_subprocess_exec(
1119+
include_expansions_in_env=includes, args=[".evergreen/scripts/perf-submission-setup.sh"]
1120+
),
11071121
expansions_update(file="src/expansion.yml"),
1108-
get_subprocess_exec(args=[".evergreen/scripts/perf-submission.sh"]),
1122+
get_subprocess_exec(
1123+
include_expansions_in_env=includes, args=[".evergreen/scripts/perf-submission.sh"]
1124+
),
11091125
]
11101126
return "send dashboard data", cmds
11111127

.evergreen/scripts/perf-submission-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# We use the requester expansion to determine whether the data is from a mainline evergreen run or not
33

4-
set -eu
4+
set -x
55

66
# shellcheck disable=SC2154
77
if [ "${requester}" == "commit" ]; then

.evergreen/scripts/perf-submission.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#!/bin/bash
22
# We use the requester expansion to determine whether the data is from a mainline evergreen run or not
33

4-
set -eu
4+
set -x
55

66
# Submit the performance data to the SPS endpoint
77
# shellcheck disable=SC2154
88
response=$(curl -s -w "\nHTTP_STATUS:%{http_code}" -X 'POST' \
99
"https://performance-monitoring-api.corp.mongodb.com/raw_perf_results/cedar_report?project=${project_id}&version=${version_id}&variant=${build_variant}&order=${parsed_order_id}&task_name=${task_name}&task_id=${task_id}&execution=${execution}&mainline=${is_mainline}" \
1010
-H 'accept: application/json' \
1111
-H 'Content-Type: application/json' \
12-
-d @performance_results.json)
12+
-d @results.json)
1313

1414
http_status=$(echo "$response" | grep "HTTP_STATUS" | awk -F':' '{print $2}')
1515
response_body=$(echo "$response" | sed '/HTTP_STATUS/d')

0 commit comments

Comments
 (0)