From 6bc8226fb0c067b17fbbaa3a953493d85877714f Mon Sep 17 00:00:00 2001
From: Vitor Bandeira <vvbandeira@precisioninno.com>
Date: Thu, 21 Nov 2024 16:49:38 +0000
Subject: [PATCH] ci: save deb artifacts with os name

Signed-off-by: Vitor Bandeira <vvbandeira@precisioninno.com>
---
 Jenkinsfile              | 9 ++++-----
 debian/move-artifacts.sh | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2b0dd428e53..f535ef204c8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -189,11 +189,10 @@ def getParallelTests(String image) {
     ];
 
     deb_os = [
-        [name: 'Ubuntu 20.04' , image: 'openroad/ubuntu20.04-dev'],
-        [name: 'Ubuntu 22.04' , image: 'openroad/ubuntu22.04-dev'],
-        [name: 'Debian 11' , image: 'openroad/debian11-dev']
+        [name: 'Ubuntu 20.04' , artifact_name: 'ubuntu-20.04', image: 'openroad/ubuntu20.04-dev'],
+        [name: 'Ubuntu 22.04' , artifact_name: 'ubuntu-22.04', image: 'openroad/ubuntu22.04-dev'],
+        [name: 'Debian 11' , artifact_name: 'debian11', image: 'openroad/debian11-dev']
     ];
-
     deb_os.each { os ->
         ret["Build .deb - ${os.name}"] = {
             node {
@@ -215,7 +214,7 @@ def getParallelTests(String image) {
                         def version = sh(script: 'git describe | sed s,^v,,', returnStdout: true).trim();
                         sh label: 'Create Changelog', script: "./debian/create-changelog.sh ${version}";
                         sh label: 'Run debuild', script: 'debuild --preserve-env --preserve-envvar=PATH -B -j$(nproc)';
-                        sh label: 'Move generated files', script: "./debian/move-artifacts.sh ${version}";
+                        sh label: 'Move generated files', script: "./debian/move-artifacts.sh ${version} ${os.artifact_name}";
                         archiveArtifacts artifacts: '*' + "${version}" + '*';
                     }
                 }
diff --git a/debian/move-artifacts.sh b/debian/move-artifacts.sh
index 16b0d332a3b..d2329ab9b9a 100755
--- a/debian/move-artifacts.sh
+++ b/debian/move-artifacts.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-if [[ $# -ne 1  ]]; then
+if [[ $# -ne 2  ]]; then
     echo "Error: This script requires exactly one argument."
-    echo "usage: $0 <VERSION>"
+    echo "usage: $0 <VERSION> <OS_NAME>"
     exit 1
 fi
 
@@ -10,5 +10,5 @@ for file in ../*${1}*; do
     base_name=$(basename "$file")
     name="${base_name%.*}"
     ext="${base_name##*.}"
-    mv "$file" "${name}-${os_name}.${ext}"
+    mv "$file" "${name}-${2}.${ext}"
 done