@@ -144,6 +144,7 @@ def checkDeploymentTestSuite() {
144
144
def enableFips = env. ENABLE_FIPS ? env. ENABLE_FIPS . toBoolean() : false
145
145
def enableMkeDebug = env. ENABLE_MKE_DEBUG ? env. ENABLE_MKE_DEBUG . toBoolean() : false
146
146
def aioCluster = env. AIO_CLUSTER ? env. AIO_CLUSTER . toBoolean() : false
147
+ def dockerServicesCheckSkip = env. DOCKER_SERVICES_CHECK_SKIP ? env. DOCKER_SERVICES_CHECK_SKIP . toBoolean() : false
147
148
def useVsphereVvmtObjects = env. VSPHERE_USE_VVMT_OBJECTS ? env. VSPHERE_USE_VVMT_OBJECTS . toBoolean() : false
148
149
def enableBv2Smoke = true
149
150
def runCacheWarmup = env. CACHE_WARMUP_ENABLED ? env. CACHE_WARMUP_ENABLED . toBoolean() : false
@@ -244,7 +245,6 @@ def checkDeploymentTestSuite() {
244
245
245
246
if (commitMsg ==~ / (?s).*\[ half-virtual\] .*/ || env. GERRIT_EVENT_COMMENT_TEXT ==~ / (?s).*half-virtual.*/ || upgradeMgmt) {
246
247
bmDeployType = ' half-virtual'
247
- common. infoMsg(' Half-virtual will be deployed by default on upgrade case' )
248
248
}
249
249
250
250
if (commitMsg ==~ / (?s).*\[ ui-e2e-nw\] .*/ || env. GERRIT_EVENT_COMMENT_TEXT ==~ / (?s).*ui-e2e-nw.*/ ) {
@@ -384,6 +384,10 @@ def checkDeploymentTestSuite() {
384
384
enableBMDemo = false
385
385
}
386
386
387
+ if (bmDeployType == ' half-virtual' && enablebmCoreDemo) {
388
+ common. infoMsg(' Half-virtual will be deployed by default on upgrade case' )
389
+ }
390
+
387
391
if (commitMsg ==~ / (?s).*\[ disable-bm-core-cleanup\] .*/ || env. GERRIT_EVENT_COMMENT_TEXT ==~ / (?s).*disable-bm-core-cleanup\\ .*/ ) {
388
392
bmCoreCleanup = false
389
393
}
@@ -539,6 +543,11 @@ def checkDeploymentTestSuite() {
539
543
aioCluster = true
540
544
}
541
545
546
+ if (commitMsg ==~ / (?s).*\[ enable-docker-services-check\] .*/ || env. GERRIT_EVENT_COMMENT_TEXT ==~ / (?s).*aio-cluster.*/ ) {
547
+ dockerServicesCheckSkip = false
548
+ common. warningMsg(' Forced enable docker service check for all job on WF' )
549
+ }
550
+
542
551
if (commitMsg ==~ / (?s).*\[ cache-warmup\] .*/ || env. GERRIT_EVENT_COMMENT_TEXT ==~ / (?s).*cache-warmup.*/ ) {
543
552
runCacheWarmup = true
544
553
}
@@ -711,6 +720,7 @@ def checkDeploymentTestSuite() {
711
720
MKE DEBUG enabled: ${ enableMkeDebug}
712
721
Pause for debug enabled: ${ pauseForDebug}
713
722
AIO cluster: ${ aioCluster}
723
+ Docker services check skip: ${ dockerServicesCheckSkip}
714
724
Use Vsphere VVMT Objects: ${ useVsphereVvmtObjects}
715
725
Bootsrap v2 smoke checks enabled: ${ enableBv2Smoke}
716
726
Run Cache warmup for child clusters: ${ runCacheWarmup}
@@ -796,6 +806,7 @@ def checkDeploymentTestSuite() {
796
806
enableFips : enableFips,
797
807
enableMkeDebugEnabled : enableMkeDebug,
798
808
aioCluster : aioCluster,
809
+ dockerServicesCheckSkip : dockerServicesCheckSkip,
799
810
useVsphereVvmtObjects : useVsphereVvmtObjects,
800
811
bv2SmokeEnabled : enableBv2Smoke,
801
812
runCacheWarmup : runCacheWarmup,
@@ -1134,6 +1145,7 @@ def triggerPatchedComponentDemo(component, patchSpec = '', configurationFile = '
1134
1145
booleanParam(name : ' ENABLE_FIPS' , value : triggers. enableFips),
1135
1146
booleanParam(name : ' ENABLE_MKE_DUBUG' , value : triggers. enableMkeDebugEnabled),
1136
1147
booleanParam(name : ' AIO_CLUSTER' , value : triggers. aioCluster),
1148
+ booleanParam(name : ' DOCKER_SERVICES_CHECK_SKIP' , value : triggers. dockerServicesCheckSkip),
1137
1149
booleanParam(name : ' BM_CORE_CLEANUP' , value : triggers. bmCoreCleanup),
1138
1150
booleanParam(name : ' DISABLE_KUBE_API_AUDIT' , value : triggers. disableKubeApiAudit),
1139
1151
booleanParam(name : " AUDITD_ENABLE" , value : triggers. auditdEnabled),
0 commit comments