Skip to content

DAOS-18348 build: Simplify skipping stages #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phender wants to merge 1 commit into
base: master
Choose a base branch
from
+52 −43
Open

DAOS-18348 build: Simplify skipping stages #522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 52 additions & 43 deletions vars/getFunctionalTestStage.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Map call(Map kwargs = [:]) {
String other_packages = kwargs.get('other_packages', '')
Boolean run_if_pr = kwargs.get('run_if_pr', false)
Boolean run_if_landing = kwargs.get('run_if_landing', false)
Boolean runStage = kwargs.get('runStage', true)
Map job_status = kwargs.get('job_status', [:])

return {
Expand All @@ -57,57 +58,65 @@ Map call(Map kwargs = [:]) {
String tags = getFunctionalTags(
pragma_suffix: pragma_suffix, stage_tags: stage_tags, default_tags: default_tags)

Map skip_kwargs = [
if (!runStage) {
println("[${name}] Stage skipped by runStage=false")
Utils.markStageSkippedForConditional("${name}")
return
} else {
// To be removed once all stages have been converted to use runStage.
Map skip_kwargs = [
'tags': tags,
'pragma_suffix': pragma_suffix,
'distro': distro,
'run_if_pr': run_if_pr,
'run_if_landing': run_if_landing]
if (skipFunctionalTestStage(skip_kwargs)) {
println("[${name}] Stage skipped by skipFunctionalTestStage()")
Utils.markStageSkippedForConditional("${name}")
} else {
node(cachedCommitPragma("Test-label${pragma_suffix}", label)) {
// Ensure access to any branch provisioning scripts exist
println("[${name}] Check out '${base_branch}' from version control")
if (base_branch) {
checkoutScm(
url: 'https://github.com/daos-stack/daos.git',
branch: base_branch,
withSubmodules: false,
pruneStaleBranch: true)
} else {
checkoutScm(pruneStaleBranch: true)
}
if (skipFunctionalTestStage(skip_kwargs)) {
println("[${name}] Stage skipped by skipFunctionalTestStage()")
Utils.markStageSkippedForConditional("${name}")
return
}
}

node(cachedCommitPragma("Test-label${pragma_suffix}", label)) {
// Ensure access to any branch provisioning scripts exist
println("[${name}] Check out '${base_branch}' from version control")
if (base_branch) {
checkoutScm(
url: 'https://github.com/daos-stack/daos.git',
branch: base_branch,
withSubmodules: false,
pruneStaleBranch: true)
} else {
checkoutScm(pruneStaleBranch: true)
}

try {
println("[${name}] Running functionalTest() on ${label} with tags=${tags}")
jobStatusUpdate(
job_status,
name,
functionalTest(
image_version: image_version,
inst_repos: daosRepos(distro),
inst_rpms: functionalPackages(
clientVersion: 1,
nextVersion: next_version,
addDaosPkgs: 'tests-internal',
rpmDistribution: rpm_distro) + ' ' + other_packages,
test_tag: tags,
ftest_arg: getFunctionalArgs(
pragma_suffix: pragma_suffix,
nvme: nvme,
default_nvme: default_nvme,
provider: provider)['ftest_arg'],
test_function: 'runTestFunctionalV2'))
} finally {
println("[${name}] Running functionalTestPostV2()")
functionalTestPostV2()
jobStatusUpdate(job_status, name)
}
try {
println("[${name}] Running functionalTest() on ${label} with tags=${tags}")
jobStatusUpdate(
job_status,
name,
functionalTest(
image_version: image_version,
inst_repos: daosRepos(distro),
inst_rpms: functionalPackages(
clientVersion: 1,
nextVersion: next_version,
addDaosPkgs: 'tests-internal',
rpmDistribution: rpm_distro) + ' ' + other_packages,
test_tag: tags,
ftest_arg: getFunctionalArgs(
pragma_suffix: pragma_suffix,
nvme: nvme,
default_nvme: default_nvme,
provider: provider)['ftest_arg'],
test_function: 'runTestFunctionalV2'))
} finally {
println("[${name}] Running functionalTestPostV2()")
functionalTestPostV2()
jobStatusUpdate(job_status, name)
}
}
println("[${name}] Finished with ${job_status}")
}
println("[${name}] Finished with ${job_status}")
}
}