Skip to content
Snippets Groups Projects
Commit 80c15c90 authored by Mark Beierl's avatar Mark Beierl
Browse files

Bug 1876: Artifactory times out


Added a lockable resource semaphore around queries to artifactory
to prevent overloading the server.

Fixes Bug 1876

Change-Id: I17979e7fa5d2ed2405873e7dda588d7104741817
Signed-off-by: default avatarbeierlm <mark.beierl@canonical.com>
(cherry picked from commit f83c20ab)
parent 7278f0a6
No related branches found
No related tags found
No related merge requests found
......@@ -212,28 +212,29 @@ node("${params.NODE}") {
def upstreamComponent=""
if ( params.UPSTREAM_JOB_NAME ) {
println("Fetching upstream job artifact from ${params.UPSTREAM_JOB_NAME}")
lock('Artifactory') {
step ([$class: 'CopyArtifact',
projectName: "${params.UPSTREAM_JOB_NAME}",
selector: [$class: 'SpecificBuildSelector',
buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
])
upstreamComponent = ci_helper.get_mdg_from_project(
ci_helper.get_env_value('build.env','GERRIT_PROJECT'))
def buildNumber = ci_helper.get_env_value('build.env','BUILD_NUMBER')
dir("$upstreamComponent") {
// the upstream job name contains suffix with the project. Need this stripped off
def project_without_branch = params.UPSTREAM_JOB_NAME.split('/')[0]
def packages = ci_helper.get_archive(params.ARTIFACTORY_SERVER,
upstreamComponent,
GERRIT_BRANCH,
"${project_without_branch} :: ${GERRIT_BRANCH}",
buildNumber)
step ([$class: 'CopyArtifact',
projectName: "${params.UPSTREAM_JOB_NAME}",
selector: [$class: 'SpecificBuildSelector',
buildNumber: "${params.UPSTREAM_JOB_NUMBER}"]
])
upstreamComponent = ci_helper.get_mdg_from_project(
ci_helper.get_env_value('build.env','GERRIT_PROJECT'))
def buildNumber = ci_helper.get_env_value('build.env','BUILD_NUMBER')
dir("$upstreamComponent") {
// the upstream job name contains suffix with the project. Need this stripped off
def project_without_branch = params.UPSTREAM_JOB_NAME.split('/')[0]
def packages = ci_helper.get_archive(params.ARTIFACTORY_SERVER,
upstreamComponent,
GERRIT_BRANCH,
"${project_without_branch} :: ${GERRIT_BRANCH}",
buildNumber)
packageList.addAll(packages)
println("Fetched pre-merge ${params.UPSTREAM_JOB_NAME}: ${packages}")
}
packageList.addAll(packages)
println("Fetched pre-merge ${params.UPSTREAM_JOB_NAME}: ${packages}")
}
} // lock artifactory
}
parallelSteps = [:]
......@@ -262,7 +263,9 @@ node("${params.NODE}") {
}
}
}
parallel parallelSteps
lock('Artifactory') {
parallel parallelSteps
}
///////////////////////////////////////////////////////////////////////////////////////
// Create Devops APT repository
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment