From d7623132e5419b4bac3ee19c960bf25ee31bfd36 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Tue, 5 Feb 2019 12:32:12 +0100
Subject: [PATCH] Correction upload des paquets sur Vulcain

---
 vars/tamarin.groovy | 5 +++--
 vars/vulcain.groovy | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vars/tamarin.groovy b/vars/tamarin.groovy
index 5889da8..82a18ce 100644
--- a/vars/tamarin.groovy
+++ b/vars/tamarin.groovy
@@ -1,6 +1,7 @@
 def buildPackageWithCPKG(
     String packageProfile = "debian",
     String packageArch = "",
+    String packageBranch = "",
     String baseImage = "", 
     String destDir = "./packages",
     Boolean forceRebuild = false,
@@ -39,7 +40,7 @@ def buildPackageWithCPKG(
             
             if (publishPackages) {
                 stage("Publish ${packageEnv} packages (version ${packageVersion}) on Vulcain") {
-                    vulcain.publish(destDir, packageEnv, packageDistrib.replace('-', '/'))
+                    vulcain.publish(destDir, packageEnv, packageBranch)
                 }
             }
         }
@@ -51,7 +52,7 @@ def buildPackageWithCPKG(
 def buildPackage(
     String packageProfile = "debian", 
     String packageArch = "",
-    String baseImage = "", 
+    String baseImage = "",
     String destDir = "./packages",
     Boolean forceRebuild = false
 ) {
diff --git a/vars/vulcain.groovy b/vars/vulcain.groovy
index 3fcf238..5ccc3e1 100644
--- a/vars/vulcain.groovy
+++ b/vars/vulcain.groovy
@@ -8,14 +8,14 @@ def publish(
     if (!packagesBranch) {
         packagesBranch = env.BRANCH_NAME
     }
+    
     withCredentials([
         sshUserPrivateKey(credentialsId: sshCredentialsId, keyFileVariable: 'VULCAIN_SSH_KEY', usernameVariable: 'VULCAIN_SSH_USER')
     ]) {
         echo "Publishing packages to '${packagesEnv}/${packagesBranch}'"
         sh """
-        SSH_ARGS='-i ${VULCAIN_SSH_KEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
-        ssh \$SSH_ARGS ${VULCAIN_SSH_USER}@${vulcainHost} mkdir -p '/home/${VULCAIN_SSH_USER}/packages/${packagesEnv}/${packagesBranch}'
-        scp \$SSH_ARGS -r ${packagesDir}/*.deb '${VULCAIN_SSH_USER}@${vulcainHost}:/home/${VULCAIN_SSH_USER}/packages/${packagesEnv}/${packagesBranch}/'
+        ssh -i '${VULCAIN_SSH_KEY}' -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '${VULCAIN_SSH_USER}@${vulcainHost}' mkdir -p '/home/${VULCAIN_SSH_USER}/packages/${packagesEnv}/${packagesBranch}'
+        scp -i '${VULCAIN_SSH_KEY}' -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -r ${packagesDir}/*.deb '${VULCAIN_SSH_USER}@${vulcainHost}:/home/${VULCAIN_SSH_USER}/packages/${packagesEnv}/${packagesBranch}/'
         """
     }
 }
\ No newline at end of file