diff --git a/Jenkinsfile b/Jenkinsfile index d5a3a117b..545c07bf9 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -765,10 +765,10 @@ pipeline { git commit -m "Update pipeline-lib branch to self''' + (cachedCommitPragma('Test-skip-build', 'true') == 'true' ? '' : '\n\nSkip-unit-tests: true') + '''" Jenkinsfile - git push -f origin $branch_name:$branch_name else git show fi + git push -f origin $branch_name:$branch_name sleep 10''' sh label: 'Delete local test branch', script: '''dir="daos-''' + env.TEST_BRANCH.replaceAll('/', '-') + '''" diff --git a/vars/daosPackagesVersion.groovy b/vars/daosPackagesVersion.groovy index 3232ec25d..d59666f65 100644 --- a/vars/daosPackagesVersion.groovy +++ b/vars/daosPackagesVersion.groovy @@ -39,6 +39,8 @@ String call(String distro, String next_version) { String target_branch = env.CHANGE_TARGET ? env.CHANGE_TARGET : env.BRANCH_NAME String _distro = distro + println('daosPackagesVersion(' + _distro + ', ' + next_version + ')') + // build parameter (CI_RPM_TEST_VERSION) has highest priority, followed by commit pragma // TODO: this should actually be determined from the PR-repos artifacts String version = rpmTestVersion() @@ -52,14 +54,19 @@ String call(String distro, String next_version) { } if (target_branch =~ testBranchRE()) { + println(target_branch + ' =~ ' + testBranchRE()) // weekly-test just wants the latest for the branch if (rpm_version_cache != '' && rpm_version_cache != 'locked') { + println('1: rpm_version_cache == ' + rpm_version_cache ) + println('1: rpmDistValue(' + _distro + ') == ' + rpmDistValue(_distro)) return rpm_version_cache + rpmDistValue(_distro) } if (rpm_version_cache == '') { // no cached value and nobody's getting it rpm_version_cache = 'locked' + println('calling daosLatestVersion(' + next_version + ', ' + _distro + ')') rpm_version_cache = daosLatestVersion(next_version, _distro) + println('rpm_version_cache == ' + rpm_version_cache) } else { // somebody else is getting it, wait for them Integer i = 30 @@ -71,8 +78,11 @@ String call(String distro, String next_version) { rpm_version_cache = daosLatestVersion(next_version, _distro) } } + println('2: rpm_version_cache == ' + rpm_version_cache ) + println('2: rpmDistValue(' + _distro + ') == ' + rpmDistValue(_distro)) return rpm_version_cache + rpmDistValue(_distro) } + println(target_branch + ' !~ ' + testBranchRE()) /* what's the query to get the highest 1.0.x package? if (target_branch == "weekly-testing-1.x") {