Skip to content

Commit 86acd60

Browse files
MDBF-1201: add --view tests to branch protection
Only known green mtr tests under --view-protocol, i.e. --suite=main. MDEV-40142 should be fixed before adding deploying the changes to a protected branches builder.
1 parent 99fac3f commit 86acd60

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

common_factories.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import os
22
import re
3+
from typing import Union
34

45
from twisted.internet import defer
56

@@ -572,9 +573,12 @@ def addS3Tests(factory, mtrDbPool):
572573
return factory
573574

574575

575-
def getQuickBuildFactory(test_type, mtrDbPool):
576+
def getQuickBuildFactory(test_type: Union[str, list[str]], mtrDbPool):
576577
f = getBuildFactoryPreTest()
577-
addTests(f, test_type, mtrDbPool, util.Property("mtr_additional_args", default=""))
578+
if isinstance(test_type, str):
579+
test_type = [test_type]
580+
for typ in test_type:
581+
addTests(f, typ, mtrDbPool, util.Property("mtr_additional_args", default=""))
578582
addGaleraTests(f, mtrDbPool)
579583
addS3Tests(f, mtrDbPool)
580584
return addPostTests(f)

constants.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
"debug-emb": "--embedded",
268268
"debug-emb-ps": "--embedded --ps-protocol",
269269
"debug-ps": "--ps-protocol",
270-
"debug-view": "--view-protocol",
270+
"debug-view": "--suite=main --view-protocol",
271271
"emb": "--embedded",
272272
"emb-ps": "--embedded --ps-protocol",
273273
"msan": "",

master-protected-branches/master.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ c["builders"].append(
457457
"additional_args": "-DWITH_EMBEDDED_SERVER:BOOL=ON -DWITH_DBUG_TRACE=OFF",
458458
"mtr_additional_args": '--skip-test="main\.show_analyze_json"',
459459
},
460-
factory=getQuickBuildFactory("debug-emb", mtrDbPool),
460+
factory=getQuickBuildFactory(["debug-emb", "debug-view"], mtrDbPool),
461461
)
462462
)
463463

0 commit comments

Comments
 (0)