Skip to content

Commit a4b1274

Browse files
brianjmurrellbrianjmurrell
committed
Default to doing builds in the daos test stages
Fix some linting issues. #Pragmas from previous commit message: Skip-PR-comments: true Skip-checkpatch: true Skip-python-bandit: true Skip-build: true Quick-build: true Quick-Functional: true Skip-unit-tests: true Skip-test: true Allow-unstable-test: true #RPM-test-version: version[-release] #RPM-test-version: # VM1-label: ci_vm1 # Ubuntu-VM9-label: ci_vm9 # Leap15-VM9-label: ci_vm9 # EL8-VM9-label: ci_vm9 Skip-PR-comments: true Skip-PR-comments: true Skip-PR-comments: true Skip-checkpatch: true Skip-python-bandit: true Skip-build: true Quick-build: true Quick-Functional: true Skip-unit-tests: true Skip-test: true Allow-unstable-test: true #RPM-test-version: version[-release] #RPM-test-version: # VM1-label: ci_vm1 # Ubuntu-VM9-label: ci_vm9 # Leap15-VM9-label: ci_vm9 # EL8-VM9-label: ci_vm9 Skip-PR-comments: true Skip-PR-comments: true Skip-checkpatch: true Skip-python-bandit: true Skip-build: true Quick-build: true Quick-Functional: true Skip-unit-tests: true Skip-test: true Allow-unstable-test: true #RPM-test-version: version[-release] #RPM-test-version: # VM1-label: ci_vm1 # Ubuntu-VM9-label: ci_vm9 # Leap15-VM9-label: ci_vm9 # EL8-VM9-label: ci_vm9 Skip-PR-comments: true Skip-checkpatch: true Skip-python-bandit: true Skip-build: true Quick-build: true Quick-Functional: true Skip-unit-tests: true Skip-test: true Allow-unstable-test: true #RPM-test-version: version[-release] #RPM-test-version: # VM1-label: ci_vm1 # Ubuntu-VM9-label: ci_vm9 # Leap15-VM9-label: ci_vm9 # EL8-VM9-label: ci_vm9 Skip-checkpatch: true Skip-python-bandit: true Skip-build: true Quick-build: true Quick-Functional: true Skip-unit-tests: true Skip-test: true Allow-unstable-test: true #RPM-test-version: version[-release] #RPM-test-version: # VM1-label: ci_vm1 # Ubuntu-VM9-label: ci_vm9 # Leap15-VM9-label: ci_vm9 # EL8-VM9-label: ci_vm9 Skip-PR-comments: true Skip-PR-comments: true Skip-PR-comments: true Skip-PR-comments: true Signed-off-by: Brian J. Murrell <[email protected]> Skip-PR-comments: true
1 parent ace0a1f commit a4b1274

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

‎Jenkinsfile

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env groovy
22
/* groovylint-disable DuplicateListLiteral, DuplicateNumberLiteral, DuplicateStringLiteral, NestedBlockDepth */
3+
/* groovylint-disable VariableName */
34
/* Copyright (C) 2019-2022 Intel Corporation
45
* All rights reserved.
56
*
@@ -46,11 +47,13 @@ void job_status_update(String name=env.STAGE_NAME,
4647
String key = name.replace(' ', '_')
4748
key = key.replaceAll('[ .]', '_')
4849
if (job_status_internal.containsKey(key)) {
49-
// groovylint-disable-next-line NoDef
50+
/* groovylint-disable-next-line NoDef, VariableTypeRequired */
5051
def myStage = job_status_internal[key]
52+
/* groovylint-disable-next-line Instanceof */
5153
if (myStage instanceof Map) {
54+
/* groovylint-disable-next-line Instanceof */
5255
if (value instanceof Map) {
53-
value.each{ resultKey, data -> myStage[resultKey] = data }
56+
value.each { resultKey, data -> myStage[resultKey] = data }
5457
return
5558
}
5659
// Update result with single value
@@ -60,14 +63,16 @@ void job_status_update(String name=env.STAGE_NAME,
6063
}
6164
// pass through value
6265
job_status_internal[key] = value
63-
}
66+
}
6467

6568
// groovylint-disable-next-line MethodParameterTypeRequired, NoDef
6669
void job_step_update(def value) {
67-
if (value == null) {
68-
value = currentBuild.currentResult
70+
/* groovylint-disable-next-line NoDef, VariableTypeRequired */
71+
def _value = value
72+
if (_value == null) {
73+
_value = currentBuild.currentResult
6974
}
70-
job_status_update(env.STAGE_NAME, value)
75+
job_status_update(env.STAGE_NAME, _value)
7176
}
7277

7378
// Don't define this as a type or it loses it's global scope
@@ -126,7 +131,7 @@ pipeline {
126131
junit_files: '*.xml non-exist*.xml',
127132
failure_artifacts: env.STAGE_NAME))
128133
}
129-
// runTest handles SCM notification via stepResult
134+
// runTest handles SCM notification via stepResult
130135
} // stage('grep JUnit results tests failure case')
131136
stage('grep JUnit results tests error case 1') {
132137
agent {
@@ -144,7 +149,7 @@ pipeline {
144149
junit_files: '*.xml non-exist*.xml',
145150
failure_artifacts: env.STAGE_NAME))
146151
}
147-
// runTest handles SCM notification via stepResult
152+
// runTest handles SCM notification via stepResult
148153
} // stage('grep JUnit results tests error case 1')
149154
stage('grep JUnit results tests error case 2') {
150155
agent {
@@ -162,7 +167,7 @@ pipeline {
162167
junit_files: '*.xml non-exist*.xml',
163168
failure_artifacts: env.STAGE_NAME))
164169
}
165-
// runTest handles SCM notification via stepResult
170+
// runTest handles SCM notification via stepResult
166171
} // stage('grep JUnit results tests error case 2')
167172
stage('publishToRepository RPM tests') {
168173
when {
@@ -267,7 +272,7 @@ pipeline {
267272
junit_files: null,
268273
failure_artifacts: env.STAGE_NAME))
269274
}
270-
// runTest handles SCM notification via stepResult
275+
// runTest handles SCM notification via stepResult
271276
} //stage('provisionNodes with release/0.9 Repo')
272277
stage('provisionNodes with master Repo') {
273278
when {
@@ -293,7 +298,7 @@ pipeline {
293298
junit_files: null,
294299
failure_artifacts: env.STAGE_NAME))
295300
}
296-
// runTest handles SCM notification via stepResult
301+
// runTest handles SCM notification via stepResult
297302
} // stage('provisionNodes with master Repo')
298303
stage('provisionNodes with slurm EL8') {
299304
when {
@@ -321,7 +326,7 @@ pipeline {
321326
junit_files: null,
322327
failure_artifacts: env.STAGE_NAME))
323328
}
324-
// runTest handles SCM notification via stepResult
329+
// runTest handles SCM notification via stepResult
325330
} //stage('provisionNodes with slurm EL8')
326331
stage('provisionNodes with slurm Leap15') {
327332
when {
@@ -347,7 +352,7 @@ pipeline {
347352
junit_files: null,
348353
failure_artifacts: env.STAGE_NAME))
349354
}
350-
// runTest handles SCM notification via stepResult
355+
// runTest handles SCM notification via stepResult
351356
} //stage('provisionNodes_with_slurm_leap15')
352357
stage('Commit Pragma tests') {
353358
steps {
@@ -386,7 +391,7 @@ pipeline {
386391
// skipStage(commit_msg: cm))
387392
assert(skipStage(commit_msg: cm) == commit.skips[i])
388393
i++
389-
}
394+
}
390395
}
391396
cachedCommitPragma(clear: true)
392397
}
@@ -448,7 +453,7 @@ pipeline {
448453
// assert() is pretty lame
449454
// println('assert(' + parseStageInfo()['test_tag'] + " == ${cmp})")
450455
assert(parseStageInfo()['test_tag'] == cmp)
451-
}
456+
}
452457
}
453458
}
454459
}
@@ -549,7 +554,7 @@ pipeline {
549554
parameters: [string(name: 'TestTag',
550555
value: 'load_mpi test_core_files test_pool_info_query'),
551556
string(name: 'CI_RPM_TEST_VERSION',
552-
value: cachedCommitPragma('Test-skip-build', 'true') == 'true' ?
557+
value: cachedCommitPragma('Test-skip-build', 'false') == 'true' ?
553558
daosLatestVersion(env.TEST_BRANCH) : ''),
554559
booleanParam(name: 'CI_UNIT_TEST', value: false),
555560
booleanParam(name: 'CI_FI_el8_TEST', value: true),

0 commit comments

Comments
 (0)