Skip to content

DAOS-19247 build: Support running Bullseye - #528

Open
phender wants to merge 17 commits into
masterfrom
hendersp/DAOS-18348-2
Open

DAOS-19247 build: Support running Bullseye#528
phender wants to merge 17 commits into
masterfrom
hendersp/DAOS-18348-2

Conversation

@phender

@phender phender commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

In order to support Bullseye code coverage stages, provide additional groovy function parameters including options to override values obtained through the parseStageInfo script.

phender added 2 commits July 8, 2026 13:42
In order to support Bullseye code coverage stages, provide additional
groovy function parameters including options to override values obtained
through the parseStageInfo script.

Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
phender added 11 commits July 8, 2026 22:57
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
@phender

phender commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

Resolving reason for cb6b602 revert here:

// Backwards compatibility for new_rpm parameter.
if (!productNames && config.get('new_rpm', false)) {
productNames = ['daos', 'deps']
}

phender added 2 commits July 9, 2026 18:12
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
daltonbohning
daltonbohning previously approved these changes Jul 21, 2026
Comment thread vars/buildRpmPost.groovy
String deps_dir = 'artifacts/' + target + '/deps'
if (fileExists(deps_dir)) {
publishToRepository product: 'deps',
Map<String, String> productArtifacts = [:]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So config['productArtifacts'] is a list but we are also defining this local variable of the same name, but it is a map?
Should we change config['productArtifacts'] -> config['productNames'] so productArtifacts is not overloaded?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 206dda9

Comment thread vars/buildRpmPost.groovy Outdated
includes: rpm_version_file
}

List<String> productNames = config.get('productArtifacts', [])

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also suggests to me that it should be config['productNames']

Comment thread vars/scriptedDockerStage.groovy Outdated
String name = kwargs.get('name', '')
Boolean runStage = kwargs.get('runStage', true)
Map jobStatus = kwargs.get('jobStatus', null) ?: [:]
String dockerTag = kwargs.get('dockerTag', 'unknown-docker-tag')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this instead error? Is it even valid to pass unknown-docker-tag?

Comment thread vars/scriptedDockerStage.groovy Outdated
*/
/* groovylint-disable-next-line MethodSize */
Map call(Map kwargs = [:]) {
String name = kwargs.get('name', '')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For string params, why use empty string instead of null?

Comment thread vars/scriptedDockerStage.groovy Outdated
Comment on lines +67 to +100
if (installScript) {
println("[${name}] Running installScript")
sh label: 'Install RPMs',
script: "${installScript}"
}
if (buildScript) {
println("[${name}] Running buildScript")
sh label: 'Build deps',
script: "${buildScript}"
}
println("[${name}] Running stepMethod: ${stepMethod?.getClass()?.name}")
jobStatusUpdate(jobStatus, name, stepMethod.call(stepMethodArgs))
if (valgrindSconsBuildArgs) {
println("[${name}] Running valgrind build for NLT")
// For non-release builds, create a separate build with the valgrind
// tag for NLT memcheck testing. This is necessary to avoid problems
// caused by valgrind being confused by the Go runtime. We don't want
// to use the valgrind build for normal testing because it is much
// slower. BUILD_TYPE=dev is set for PR/dev builds in sconsArgs(), and
// TARGET_TYPE=release is used to select pre-built cached prerequisites.
jobStatusUpdate(jobStatus, name, sconsBuild(valgrindSconsBuildArgs))
sh label: 'Stash valgrind install tree for NLT',
script: 'tar -C / -cf opt-daos-valgrind.tar opt/daos'
stash(name: 'opt-daos-valgrind', includes: 'opt-daos-valgrind.tar')
}
if (generateRpmsScript) {
println("[${name}] Running generateRpmsScript")
sh label: 'Generate RPMs',
script: "${generateRpmsScript}"
}
if (buildRpmPostArgs) {
println("[${name}] Running buildRpmPost()")
buildRpmPost(buildRpmPostArgs)
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO this kind of logic means this is not a "docker" stage. But specifically it is a "build DAOS in docker" stage. And it's not really a library function but more so the entire definition of the stage, which seems more appropriate in the daos repo

phender added 2 commits July 24, 2026 21:38
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Signed-off-by: Phil Henderson <phillip.henderson@hpe.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants