Skip to content

Commit a7ba410

Browse files
phenderphender
authored
DAOS-9989 test: Enable provider-testing* branches (#319)
Enable weekly tcp/ucx testing in new provider-testing* branches. Remove references to the no longer used Functional Hardware * TCP/UCX test stages. Signed-off-by: Phillip Henderson <[email protected]>
1 parent 36bfaa5 commit a7ba410

File tree

6 files changed

+20
-37
lines changed

6 files changed

+20
-37
lines changed

‎ci/provisioning/post_provision_config_common_functions.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ set_local_repo() {
191191
local version
192192
version="$(lsb_release -sr)"
193193
version=${version%%.*}
194-
if [ "$repo_server" = "artifactory" ] &&
195-
[ -z "$(rpm_test_version)" ] &&
196-
[[ ${CHANGE_TARGET:-$BRANCH_NAME} != weekly-testing* ]]; then
194+
if [ "$repo_server" = "artifactory" ] && [ -z "$(rpm_test_version)" ] &&
195+
{ [[ ${CHANGE_TARGET:-$BRANCH_NAME} != weekly-testing* ]] ||
196+
[[ ${CHANGE_TARGET:-$BRANCH_NAME} != provider-testing* ]]; }; then
197197
# Disable the daos repo so that the Jenkins job repo or a PR-repos*: repo is
198198
# used for daos packages
199199
dnf -y config-manager \

‎vars/daosPackagesVersion.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ String call(String next_version) {
5757
String call(String distro, String next_version) {
5858
String target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME
5959

60-
if (target_branch.startsWith("weekly-testing")) {
60+
if (target_branch.startsWith("weekly-testing") ||
61+
target_branch.startsWith("provider-testing")) {
6162
// weekly-test just wants the latest for the branch
6263
if (rpm_version_cache != "" && rpm_version_cache != "locked") {
6364
return rpm_version_cache + rpm_dist(distro)

‎vars/daosRepos.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ String daos_repo() {
1414

1515
String target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME
1616

17-
if (target_branch.startsWith("weekly-testing")) {
17+
if (target_branch.startsWith("weekly-testing") ||
18+
target_branch.startsWith("provider-testing")) {
1819
return ""
1920
}
2021

‎vars/parseStageInfo.groovy‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,8 @@
3535
* Default determined by this function below.
3636
*/
3737

38-
String get_build_params_tags(String param_key) {
38+
String get_build_params_tags() {
3939
// Get the tags defined by the build parameter entry for this stage
40-
if (param_key == 'tcp' && params.TestTagTCP && params.TestTagTCP != '') {
41-
return params.TestTagTCP
42-
}
43-
if (param_key == 'ucx' && params.TestTagUCX && params.TestTagUCX != '') {
44-
return params.TestTagUCX
45-
}
4640
if (params.TestTag && params.TestTag != '') {
4741
return params.TestTag
4842
}
@@ -204,7 +198,6 @@ def call(Map config = [:]) {
204198
String ftest_arg_nvme = ''
205199
String ftest_arg_repeat = ''
206200
String ftest_arg_provider = ''
207-
String param_key = ''
208201
if (stage_name.contains('Functional')) {
209202
result['test'] = 'Functional'
210203
result['node_count'] = 9
@@ -223,15 +216,6 @@ def call(Map config = [:]) {
223216
cluster_size = 'hw,medium'
224217
result['pragma_suffix'] = '-hw-medium'
225218
}
226-
if (stage_name.contains('TCP')) {
227-
ftest_arg_provider = 'ofi+tcp'
228-
param_key = 'tcp'
229-
result['pragma_suffix'] += "-tcp"
230-
} else if (stage_name.contains('UCX')) {
231-
ftest_arg_provider = 'ucx+dc_x'
232-
param_key = 'ucx'
233-
result['pragma_suffix'] += "-ucx"
234-
}
235219
}
236220
if (stage_name.contains('with Valgrind')) {
237221
result['pragma_suffix'] = '-valgrind'
@@ -243,15 +227,15 @@ def call(Map config = [:]) {
243227
String tag
244228
if (startedByUser()) {
245229
// Test tags defined by the build parameters override all other tags
246-
tag = get_build_params_tags(param_key)
230+
tag = get_build_params_tags()
247231
}
248232
if (!tag && startedByTimer()) {
249233
// Stage defined tags take precedence in timed builds
250234
tag = config['test_tag']
251235
if (!tag) {
252236
// Otherwise use the default timed build tags
253237
tag = "pr daily_regression"
254-
if (env.BRANCH_NAME.startsWith("weekly-testing") && !param_key) {
238+
if (env.BRANCH_NAME.startsWith("weekly-testing")) {
255239
tag = "full_regression"
256240
}
257241
}

‎vars/skipStage.groovy‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ boolean skip_if_unstable() {
102102
cachedCommitPragma('Allow-unstable-test').toLowerCase() == 'true' ||
103103
env.BRANCH_NAME == 'master' ||
104104
env.BRANCH_NAME.startsWith("weekly-testing") ||
105+
env.BRANCH_NAME.startsWith("provider-testing") ||
105106
env.BRANCH_NAME.startsWith("release/")) {
106107
return false
107108
}
@@ -316,6 +317,9 @@ boolean call(Map config = [:]) {
316317
(env.BRANCH_NAME.startsWith('weekly-testing') &&
317318
! startedByTimer() &&
318319
! startedByUser()) ||
320+
(env.BRANCH_NAME.startsWith('provider-testing') &&
321+
! startedByTimer() &&
322+
! startedByUser()) ||
319323
skip_if_unstable()
320324
case "Test on CentOS 7 [in] Vagrant":
321325
return skip_stage_pragma('vagrant-test', 'true') &&
@@ -405,6 +409,9 @@ boolean call(Map config = [:]) {
405409
(env.BRANCH_NAME.startsWith('weekly-testing') &&
406410
! startedByTimer() &&
407411
! startedByUser()) ||
412+
(env.BRANCH_NAME.startsWith('provider-testing') &&
413+
! startedByTimer() &&
414+
! startedByUser()) ||
408415
skip_if_unstable()
409416
case "Functional_Hardware_Small":
410417
case "Functional Hardware Small":
@@ -420,18 +427,6 @@ boolean call(Map config = [:]) {
420427
case "Bullseye Report on EL 8":
421428
return env.BULLSEYE == null ||
422429
skip_stage_pragma('bullseye', 'true')
423-
case 'Functional Hardware Small TCP':
424-
return skip_ftest_hw('small-tcp', target_branch)
425-
case 'Functional Hardware Medium TCP':
426-
return skip_ftest_hw('medium-tcp', target_branch)
427-
case 'Functional Hardware Large TCP':
428-
return skip_ftest_hw('large-tcp', target_branch)
429-
case 'Functional Hardware Small UCX':
430-
return skip_ftest_hw('small-ucx', target_branch)
431-
case 'Functional Hardware Medium UCX':
432-
return skip_ftest_hw('medium-ucx', target_branch)
433-
case 'Functional Hardware Large UCX':
434-
return skip_ftest_hw('large-ucx', target_branch)
435430
default:
436431
println("Don't know how to skip stage \"${env.STAGE_NAME}\", not skipping")
437432
}

‎vars/testsInStage.groovy‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
boolean call() {
1414
if (env.BRANCH_NAME.startsWith('weekly-testing') ||
15-
(env.CHANGE_TARGET && env.CHANGE_TARGET.startsWith('weekly-testing'))) {
15+
env.BRANCH_NAME.startsWith('provider-testing') ||
16+
(env.CHANGE_TARGET && env.CHANGE_TARGET.startsWith('weekly-testing')) ||
17+
(env.CHANGE_TARGET && env.CHANGE_TARGET.startsWith('provider-testing'))) {
1618
/* This doesn't actually work on weekly-testing branches due to a lack
1719
* src/test/ftest/launch.py (and friends). We could probably just
1820
* check that out from the branch we are testing against (i.e. master,

0 commit comments

Comments
 (0)