Skip to content

Commit 7576238

Browse files
ryon-jensenryon-jensen
committed
Experimenting with Cluster in a box
Signed-off-by: Ryon Jensen <ryon.jensen@hpe.com>
1 parent 838c46f commit 7576238

8 files changed

Lines changed: 150 additions & 158 deletions

File tree

‎Jenkinsfile‎

Lines changed: 138 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,29 @@ pipeline {
679679
}
680680
}
681681
}
682-
stage('Unit Tests') {
682+
stage('Test Storage Prep on EL 8.8') {
683+
when {
684+
beforeAgent true
685+
expression { params.CI_STORAGE_PREP_LABEL != '' }
686+
}
687+
agent {
688+
label params.CI_STORAGE_PREP_LABEL
689+
}
690+
steps {
691+
job_step_update(
692+
storagePrepTest(
693+
inst_repos: daosRepos(),
694+
inst_rpms: functionalPackages(1, next_version(), 'tests-internal')))
695+
}
696+
post {
697+
cleanup {
698+
job_status_update()
699+
}
700+
}
701+
} // stage('Test Storage Prep')
702+
703+
704+
stage('All Tests') {
683705
when {
684706
beforeAgent true
685707
expression { !skipStage() }
@@ -826,16 +848,6 @@ pipeline {
826848
}
827849
}
828850
} // stage('Unit Test bdev with memcheck')
829-
}
830-
}
831-
stage('Test') {
832-
when {
833-
beforeAgent true
834-
//expression { !paramsValue('CI_FUNCTIONAL_TEST_SKIP', false) && !skipStage() }
835-
// Above not working, always skipping functional VM tests.
836-
expression { !paramsValue('CI_FUNCTIONAL_TEST_SKIP', false) }
837-
}
838-
parallel {
839851
stage('Functional on EL 8.8 with Valgrind') {
840852
when {
841853
beforeAgent true
@@ -1085,142 +1097,122 @@ pipeline {
10851097
}
10861098
}
10871099
} // stage('Test RPMs on Leap 15.5')
1100+
'Functional Hardware Medium': getFunctionalTestStage(
1101+
name: 'Functional Hardware Medium',
1102+
pragma_suffix: '-hw-medium',
1103+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1104+
next_version: next_version(),
1105+
stage_tags: 'hw,medium,-provider',
1106+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1107+
nvme: 'auto',
1108+
run_if_pr: false,
1109+
run_if_landing: false,
1110+
job_status: job_status_internal
1111+
),
1112+
'Functional Hardware Medium MD on SSD': getFunctionalTestStage(
1113+
name: 'Functional Hardware Medium MD on SSD',
1114+
pragma_suffix: '-hw-medium-md-on-ssd',
1115+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1116+
next_version: next_version(),
1117+
stage_tags: 'hw,medium,-provider',
1118+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1119+
nvme: 'auto_md_on_ssd',
1120+
run_if_pr: true,
1121+
run_if_landing: false,
1122+
job_status: job_status_internal
1123+
),
1124+
'Functional Cluster Box Medium MD on SSD': getFunctionalTestStage(
1125+
name: 'Functional Cluster Box Medium MD on SSD',
1126+
pragma_suffix: '-cb-medium-md-on-ssd',
1127+
label: 'cluster_box',
1128+
next_version: next_version(),
1129+
stage_tags: 'cb,medium,-provider',
1130+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1131+
nvme: 'auto_md_on_ssd',
1132+
run_if_pr: true,
1133+
run_if_landing: false,
1134+
job_status: job_status_internal
1135+
),
1136+
'Functional Hardware Medium VMD': getFunctionalTestStage(
1137+
name: 'Functional Hardware Medium VMD',
1138+
pragma_suffix: '-hw-medium-vmd',
1139+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VMD_LABEL,
1140+
next_version: next_version(),
1141+
stage_tags: 'hw_vmd,medium',
1142+
/* groovylint-disable-next-line UnnecessaryGetter */
1143+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1144+
nvme: 'auto',
1145+
run_if_pr: false,
1146+
run_if_landing: false,
1147+
job_status: job_status_internal
1148+
),
1149+
'Functional Hardware Medium Verbs Provider': getFunctionalTestStage(
1150+
name: 'Functional Hardware Medium Verbs Provider',
1151+
pragma_suffix: '-hw-medium-verbs-provider',
1152+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL,
1153+
next_version: next_version(),
1154+
stage_tags: 'hw,medium,provider',
1155+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1156+
default_nvme: 'auto',
1157+
provider: 'ofi+verbs;ofi_rxm',
1158+
run_if_pr: false,
1159+
run_if_landing: false,
1160+
job_status: job_status_internal,
1161+
image_version: 'el9.7'
1162+
),
1163+
'Functional Hardware Medium Verbs Provider MD on SSD': getFunctionalTestStage(
1164+
name: 'Functional Hardware Medium Verbs Provider MD on SSD',
1165+
pragma_suffix: '-hw-medium-verbs-provider-md-on-ssd',
1166+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL,
1167+
next_version: next_version(),
1168+
stage_tags: 'hw,medium,provider',
1169+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1170+
default_nvme: 'auto_md_on_ssd',
1171+
provider: 'ofi+verbs;ofi_rxm',
1172+
run_if_pr: true,
1173+
run_if_landing: false,
1174+
job_status: job_status_internal,
1175+
image_version: 'el9.7'
1176+
),
1177+
'Functional Hardware Medium UCX Provider': getFunctionalTestStage(
1178+
name: 'Functional Hardware Medium UCX Provider',
1179+
pragma_suffix: '-hw-medium-ucx-provider',
1180+
label: params.FUNCTIONAL_HARDWARE_MEDIUM_UCX_PROVIDER_LABEL,
1181+
next_version: next_version(),
1182+
stage_tags: 'hw,medium,provider',
1183+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1184+
default_nvme: 'auto',
1185+
provider: cachedCommitPragma('Test-provider-ucx', 'ucx+ud_x'),
1186+
run_if_pr: false,
1187+
run_if_landing: false,
1188+
job_status: job_status_internal
1189+
),
1190+
'Functional Hardware Large': getFunctionalTestStage(
1191+
name: 'Functional Hardware Large',
1192+
pragma_suffix: '-hw-large',
1193+
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1194+
next_version: next_version(),
1195+
stage_tags: 'hw,large',
1196+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1197+
default_nvme: 'auto',
1198+
run_if_pr: false,
1199+
run_if_landing: false,
1200+
job_status: job_status_internal
1201+
),
1202+
'Functional Hardware Large MD on SSD': getFunctionalTestStage(
1203+
name: 'Functional Hardware Large MD on SSD',
1204+
pragma_suffix: '-hw-large-md-on-ssd',
1205+
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1206+
next_version: next_version(),
1207+
stage_tags: 'hw,large',
1208+
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1209+
default_nvme: 'auto_md_on_ssd',
1210+
run_if_pr: true,
1211+
run_if_landing: false,
1212+
job_status: job_status_internal
1213+
),
10881214
} // parallel
1089-
} // stage('Test')
1090-
stage('Test Storage Prep on EL 8.8') {
1091-
when {
1092-
beforeAgent true
1093-
expression { params.CI_STORAGE_PREP_LABEL != '' }
1094-
}
1095-
agent {
1096-
label params.CI_STORAGE_PREP_LABEL
1097-
}
1098-
steps {
1099-
job_step_update(
1100-
storagePrepTest(
1101-
inst_repos: daosRepos(),
1102-
inst_rpms: functionalPackages(1, next_version(), 'tests-internal')))
1103-
}
1104-
post {
1105-
cleanup {
1106-
job_status_update()
1107-
}
1108-
}
1109-
} // stage('Test Storage Prep')
1110-
stage('Test Hardware') {
1111-
when {
1112-
beforeAgent true
1113-
expression { !paramsValue('CI_FUNCTIONAL_HARDWARE_TEST_SKIP', false) && !skipStage() }
1114-
}
1115-
steps {
1116-
script {
1117-
parallel(
1118-
'Functional Hardware Medium': getFunctionalTestStage(
1119-
name: 'Functional Hardware Medium',
1120-
pragma_suffix: '-hw-medium',
1121-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1122-
next_version: next_version(),
1123-
stage_tags: 'hw,medium,-provider',
1124-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1125-
nvme: 'auto',
1126-
run_if_pr: false,
1127-
run_if_landing: false,
1128-
job_status: job_status_internal
1129-
),
1130-
'Functional Hardware Medium MD on SSD': getFunctionalTestStage(
1131-
name: 'Functional Hardware Medium MD on SSD',
1132-
pragma_suffix: '-hw-medium-md-on-ssd',
1133-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_LABEL,
1134-
next_version: next_version(),
1135-
stage_tags: 'hw,medium,-provider',
1136-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1137-
nvme: 'auto_md_on_ssd',
1138-
run_if_pr: true,
1139-
run_if_landing: false,
1140-
job_status: job_status_internal
1141-
),
1142-
'Functional Hardware Medium VMD': getFunctionalTestStage(
1143-
name: 'Functional Hardware Medium VMD',
1144-
pragma_suffix: '-hw-medium-vmd',
1145-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VMD_LABEL,
1146-
next_version: next_version(),
1147-
stage_tags: 'hw_vmd,medium',
1148-
/* groovylint-disable-next-line UnnecessaryGetter */
1149-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1150-
nvme: 'auto',
1151-
run_if_pr: false,
1152-
run_if_landing: false,
1153-
job_status: job_status_internal
1154-
),
1155-
'Functional Hardware Medium Verbs Provider': getFunctionalTestStage(
1156-
name: 'Functional Hardware Medium Verbs Provider',
1157-
pragma_suffix: '-hw-medium-verbs-provider',
1158-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL,
1159-
next_version: next_version(),
1160-
stage_tags: 'hw,medium,provider',
1161-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1162-
default_nvme: 'auto',
1163-
provider: 'ofi+verbs;ofi_rxm',
1164-
run_if_pr: false,
1165-
run_if_landing: false,
1166-
job_status: job_status_internal,
1167-
image_version: 'el9.7'
1168-
),
1169-
'Functional Hardware Medium Verbs Provider MD on SSD': getFunctionalTestStage(
1170-
name: 'Functional Hardware Medium Verbs Provider MD on SSD',
1171-
pragma_suffix: '-hw-medium-verbs-provider-md-on-ssd',
1172-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_VERBS_PROVIDER_LABEL,
1173-
next_version: next_version(),
1174-
stage_tags: 'hw,medium,provider',
1175-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1176-
default_nvme: 'auto_md_on_ssd',
1177-
provider: 'ofi+verbs;ofi_rxm',
1178-
run_if_pr: true,
1179-
run_if_landing: false,
1180-
job_status: job_status_internal,
1181-
image_version: 'el9.7'
1182-
),
1183-
'Functional Hardware Medium UCX Provider': getFunctionalTestStage(
1184-
name: 'Functional Hardware Medium UCX Provider',
1185-
pragma_suffix: '-hw-medium-ucx-provider',
1186-
label: params.FUNCTIONAL_HARDWARE_MEDIUM_UCX_PROVIDER_LABEL,
1187-
next_version: next_version(),
1188-
stage_tags: 'hw,medium,provider',
1189-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1190-
default_nvme: 'auto',
1191-
provider: cachedCommitPragma('Test-provider-ucx', 'ucx+ud_x'),
1192-
run_if_pr: false,
1193-
run_if_landing: false,
1194-
job_status: job_status_internal
1195-
),
1196-
'Functional Hardware Large': getFunctionalTestStage(
1197-
name: 'Functional Hardware Large',
1198-
pragma_suffix: '-hw-large',
1199-
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1200-
next_version: next_version(),
1201-
stage_tags: 'hw,large',
1202-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1203-
default_nvme: 'auto',
1204-
run_if_pr: false,
1205-
run_if_landing: false,
1206-
job_status: job_status_internal
1207-
),
1208-
'Functional Hardware Large MD on SSD': getFunctionalTestStage(
1209-
name: 'Functional Hardware Large MD on SSD',
1210-
pragma_suffix: '-hw-large-md-on-ssd',
1211-
label: params.FUNCTIONAL_HARDWARE_LARGE_LABEL,
1212-
next_version: next_version(),
1213-
stage_tags: 'hw,large',
1214-
default_tags: startedByTimer() ? 'pr daily_regression' : 'pr',
1215-
default_nvme: 'auto_md_on_ssd',
1216-
run_if_pr: true,
1217-
run_if_landing: false,
1218-
job_status: job_status_internal
1219-
),
1220-
)
1221-
}
1222-
}
1223-
} // stage('Test Hardware')
1215+
}
12241216
} // stages
12251217
post {
12261218
always {

‎src/tests/ftest/aggregation/punching.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_aggregation_punching(self):
2828
Enable the aggregation run and verify the space is reclaimed.
2929
3030
:avocado: tags=all,pr,daily_regression
31-
:avocado: tags=hw,medium
31+
:avocado: tags=cb,medium
3232
:avocado: tags=aggregation,mdtest,mdtest
3333
:avocado: tags=AggregationPunching,aggregatepunching,test_aggregation_punching
3434
"""

‎src/tests/ftest/container/snapshot_aggregation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_snapshot_aggregation(self):
4444
capacity by half.
4545
4646
:avocado: tags=all,pr,daily_regression
47-
:avocado: tags=hw,medium
47+
:avocado: tags=cb,medium
4848
:avocado: tags=container,snap
4949
:avocado: tags=SnapshotAggregation,test_snapshot_aggregation
5050
"""

‎src/tests/ftest/control/daos_server_helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_daos_server_helper_format(self):
3030
operations while daos_server is run as normal user.
3131
3232
:avocado: tags=all,pr,daily_regression
33-
:avocado: tags=hw,medium
33+
:avocado: tags=cb,medium
3434
:avocado: tags=control,basic,daos_server_helper
3535
:avocado: tags=DaosPrivHelperTest,test_daos_server_helper_format
3636
"""

‎src/tests/ftest/control/dmg_telemetry_io_basic.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def test_io_telemetry_metrics_basic(self):
8282
DAOS engine IO telemetry basic metrics infrastructure.
8383
8484
:avocado: tags=all,pr,daily_regression
85-
:avocado: tags=hw,medium
85+
:avocado: tags=cb,medium
8686
:avocado: tags=control,telemetry,basic
8787
:avocado: tags=TestWithTelemetryIOBasic,test_io_telemetry_metrics_basic
8888
"""

‎src/tests/ftest/control/dmg_telemetry_nvme.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def test_nvme_telemetry_metrics(self):
3232
Verify the telemetry engine NVMe metrics.
3333
3434
:avocado: tags=all,pr,daily_regression
35-
:avocado: tags=hw,medium
35+
:avocado: tags=cb,medium
3636
:avocado: tags=control,telemetry,nvme
3737
:avocado: tags=TestWithTelemetryNvme,test_nvme_telemetry_metrics
3838
"""
@@ -68,7 +68,7 @@ def test_telemetry_list_nvme(self):
6868
Verify the dmg telemetry list command.
6969
7070
:avocado: tags=all,pr,daily_regression
71-
:avocado: tags=hw,medium
71+
:avocado: tags=cb,medium
7272
:avocado: tags=control,telemetry,nvme
7373
:avocado: tags=TestWithTelemetryNvme,test_telemetry_list_nvme
7474
"""

‎src/tests/ftest/daos_racer/simple.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_daos_racer_simple(self):
2929
Running simultaneous, conflicting I/O requests.
3030
3131
:avocado: tags=all,pr,daily_regression
32-
:avocado: tags=hw,medium
32+
:avocado: tags=cb,medium
3333
:avocado: tags=io,daos_racer
3434
:avocado: tags=DaosRacerSimpleTest,test_daos_racer_simple
3535
"""

0 commit comments

Comments
 (0)