Skip to content

Commit fc40157

Browse files
chore(ci): run MTR as extern for ASan build
1 parent 209a9e5 commit fc40157

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.drone.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
311311
' --container-name ' + getContainerName("mtr") +
312312
' --distro ' + platform +
313313
' --suite-list $${MTR_SUITE_LIST}' +
314-
' --triggering-event ' + event,
314+
' --triggering-event ' + event
315+
+ if std.endsWith(result, 'ASan') then ' --run-as-extern' else '',
315316
],
316317
[if (std.member(ignoreFailureStepList, "mtr")) then "failure"]: "ignore",
317318

build/run_mtr.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ optparse.define short=c long=container-name desc="Name of the Docker container w
99
optparse.define short=d long=distro desc="Linux distro for which mtr is runned" variable=DISTRO
1010
optparse.define short=s long=suite-list desc="Comma-separated list of test suites to run" variable=MTR_SUITE_LIST
1111
optparse.define short=e long=triggering-event desc="Event that triggers testrun" variable=EVENT
12+
optparse.define short=E long=run-as-extern desc="Run MTR with --extern flag" variable=EXTERN default=false value=true
1213
optparse.define short=D long=download-data desc="Download and extract data from S3 for extended MTR" variable=DOWNLOAD_DATA default=false value=true
1314
optparse.define short=F long=full-mtr desc="Run Full Mtr" variable=FULL_MTR default=false value=true
1415

@@ -20,6 +21,7 @@ fi
2021

2122
if [[ $FULL_MTR = true ]]; then
2223
DOWNLOAD_DATA=true
24+
EXTERN=true
2325
fi
2426

2527
MTR_FULL_SET="basic,bugfixes,devregression,autopilot,extended,multinode,oracle,1pmonly"
@@ -82,7 +84,7 @@ fi
8284

8385
EXTERN_FLAG=""
8486

85-
if [[ $FULL_MTR = true ]]; then
87+
if [[ $EXTERN = true ]]; then
8688
EXTERN_FLAG="--extern socket=${SOCKET_PATH}"
8789
fi
8890

0 commit comments

Comments
 (0)