Skip to content

Commit 5b98eba

Browse files
Allow specifying downstream Test-tag value (#413)
When performing downstream testing, take any "Test-tag:" pragma from the pipeline-lib PR and pass it to the downstream test jobs. Remove 2.2 latest version check as the RPMs are no longer in the short-term repo. Fixes: SRE-2006 Signed-off-by: Brian J. Murrell <[email protected]>
1 parent 405d1ac commit 5b98eba

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ pipeline {
127127
script {
128128
assert(daosLatestVersion('master', 'el8').matches(/2.5\.\d+.*/))
129129
assert(daosLatestVersion('release/2.4', 'el8').matches(/2.[34]\.\d+.*/))
130-
assert(daosLatestVersion('release/2.2', 'el8').startsWith('2.2.'))
131130
}
132131
}
133132
}
@@ -785,7 +784,8 @@ pipeline {
785784
} // withCredentials
786785
build job: 'daos-stack/daos/' + test_branch(env.TEST_BRANCH),
787786
parameters: [string(name: 'TestTag',
788-
value: 'load_mpi test_core_files test_pool_info_query'),
787+
value: cachedCommitPragma('Test-tag',
788+
'load_mpi test_core_files test_pool_info_query')),
789789
string(name: 'CI_RPM_TEST_VERSION',
790790
value: cachedCommitPragma('Test-skip-build', 'false') == 'true' ?
791791
daosLatestVersion(env.TEST_BRANCH) : ''),

vars/getPriority.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ String call() {
1313
p = '2'
1414
} else {
1515
node(label: 'lightweight') {
16-
if (fileExists('.git')) {
17-
p = cachedCommitPragma('Priority')
18-
}
16+
p = cachedCommitPragma('Priority')
1917
}
2018
}
2119

vars/pragmasToEnv.groovy

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ String call(String commit_message) {
3434
* Method to put the commit pragmas into the environment
3535
*/
3636
Void call() {
37-
String cmd = '''if [ -n "$GIT_CHECKOUT_DIR" ] && [ -d "$GIT_CHECKOUT_DIR" ]
38-
then
39-
cd "$GIT_CHECKOUT_DIR"
40-
fi
41-
git show -s --format=%B\n'''
42-
43-
env.COMMIT_MESSAGE = sh(label: 'pragmasToEnv: lookup commit message',
44-
script: cmd,
37+
env.COMMIT_MESSAGE = sh(label: 'pragmasToEnv(): Get commit message',
38+
script: '''if [ -n "$GIT_CHECKOUT_DIR" ] && [ -d "$GIT_CHECKOUT_DIR" ]; then
39+
cd "$GIT_CHECKOUT_DIR"
40+
fi
41+
git show -s --format=%B''',
4542
returnStdout: true).trim()
4643
env.pragmas = pragmasToEnv(env.COMMIT_MESSAGE)
4744

0 commit comments

Comments
 (0)