From 81bb434d06797a51672e872f6baf77ca5fcc4993 Mon Sep 17 00:00:00 2001 From: William Petit Date: Tue, 5 Feb 2019 12:17:01 +0100 Subject: [PATCH] =?UTF-8?q?Utilisation=20du=20la=20distribution=20cible=20?= =?UTF-8?q?pour=20la=20g=C3=A9n=C3=A9ration=20de=20la=20branche=20du=20paq?= =?UTF-8?q?uet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vars/tamarin.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vars/tamarin.groovy b/vars/tamarin.groovy index 308c876..5889da8 100644 --- a/vars/tamarin.groovy +++ b/vars/tamarin.groovy @@ -33,11 +33,13 @@ def buildPackageWithCPKG( writeFile file: '.tamarinrc', text: tamarinrc stage("Build ${packageEnv} package (version ${packageVersion}) for ${packageDistrib}") { + sh "rm -rf ${destDir}/*" buildPackage(packageProfile, packageArch, baseImage, destDir, forceRebuild) + if (publishPackages) { stage("Publish ${packageEnv} packages (version ${packageVersion}) on Vulcain") { - vulcain.publish(destDir, packageEnv, env.BRANCH_NAME) + vulcain.publish(destDir, packageEnv, packageDistrib.replace('-', '/')) } } }