Skip to content

Commit 34dc078

Browse files
MDBF-1208: run default (nm) tests with --ssl
Motivation: MDEV-39318
1 parent 78d1768 commit 34dc078

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

constants.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
"amd64-ubuntu-2204-debug",
9090
"s390x-sles-1506",
9191
]
92+
BUILDERS_SSL_MTR = [
93+
"amd64-fedora-44",
94+
"amd64-rhel-8",
95+
]
9296

9397
# Defines branches for which we save packages
9498
SAVED_PACKAGE_BRANCHES = BRANCHES_MAIN + [
@@ -266,6 +270,7 @@
266270
"emb-ps": "--embedded --ps-protocol",
267271
"msan": "",
268272
"nm": "",
273+
"nm_ssl": "--ssl",
269274
"nm_engines": "--suite=spider,spider/bg,engines/funcs,engines/iuds --big --mysqld=--open-files-limit=0 --mysqld=--log-warnings=1",
270275
"nm_func_1_2": "--suite=funcs_1,funcs_2,stress,jp --big --mysqld=--open-files-limit=0 --mysqld=--log-warnings=1",
271276
"optimizer_trace": "--suite=main --mysqld=--optimizer_trace=enabled=on",

master.cfg

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ from common_factories import (
1313
getRpmAutobakeFactory,
1414
)
1515
from constants import (
16+
BUILDERS_SSL_MTR,
1617
GITHUB_STATUS_BUILDERS,
1718
)
1819
from locks import getLocks
@@ -103,7 +104,6 @@ for w_name in master_config["workers"]:
103104

104105
####### FACTORY CODE
105106

106-
f_quick_build = getQuickBuildFactory("nm", mtrDbPool)
107107
f_rpm_autobake = getRpmAutobakeFactory()
108108
f_deb_autobake = getDebAutobakeFactory()
109109

@@ -127,6 +127,9 @@ for arch in master_config["builders"]:
127127
tags.append(os_name)
128128
# Add builder only if it's not a protected branches one
129129
if builder not in GITHUB_STATUS_BUILDERS:
130+
test_type = "nm"
131+
if builder in BUILDERS_SSL_MTR:
132+
test_type = "nm_ssl"
130133
c["builders"].append(
131134
util.BuilderConfig(
132135
name=builder,
@@ -136,7 +139,7 @@ for arch in master_config["builders"]:
136139
nextBuild=nextBuild,
137140
canStartBuild=canStartBuild,
138141
locks=getLocks,
139-
factory=f_quick_build,
142+
factory=getQuickBuildFactory(test_type, mtrDbPool),
140143
)
141144
)
142145

0 commit comments

Comments
 (0)