diff --git a/pipelines/debian-packaging.jenkinsfile b/pipelines/debian-packaging.jenkinsfile index 17ade5f..5762e31 100644 --- a/pipelines/debian-packaging.jenkinsfile +++ b/pipelines/debian-packaging.jenkinsfile @@ -12,7 +12,7 @@ pipeline { triggers { // Execute pipeline every day at 7h30 to prepare docker images - cron(env.BRANCH_NAME == 'develop' ? '30 7 * * 1-5' : '') + cron('30 7 * * 1-5') } stages { @@ -20,7 +20,6 @@ pipeline { stage("Prepare build environment") { when { anyOf { - triggeredBy cause: "UserIdCause", detail: "wpetit" triggeredBy 'TimerTrigger' } } @@ -113,6 +112,7 @@ pipeline { // On attend que les paquets soient disponibles // sur Vulcain pour envoyer la notification de diffusion + // si la distribution est spécifiée waitForPackages(env.ref, result) // On liste l'ensemble des paquets construits @@ -202,9 +202,10 @@ def findMatchingVMTemplate(String distrib) { def waitForPackages(String tagRef, buildResults) { def packageVersion = tagRef.split('/')[3]; + def packageDistrib = env.packageBranch.split('/')[2]; buildResults.each { r -> - def distrib = "${r.distrib.split('-')[1]}-${r.env}" + def distrib = "${packageDistrib}-${r.env}" r.packages.each { p -> def file = new File(p)