From 6f16d0753741c522d107834115b0b78db595beb5 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Thu, 27 Mar 2025 07:36:00 +0100 Subject: [PATCH] Updated Jenkinsfile to avoid colissions --- Jenkins/Jenkinsfile-deb-pkg | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index a2a176b..d655bae 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -55,7 +55,7 @@ pipeline { sh ''' dpkg-buildpackage -us -uc mkdir -p ../artifacts && mv ../*.deb ../*.changes ../*.buildinfo ../artifacts/ - ssh aptly@172.17.8.68 "rm -rf /var/tmp/opengnsys/debian-repo/oggui && mkdir -p /var/tmp/opengnsys/debian-repo/oggui" + ssh aptly@172.17.8.68 "rm -rf /var/tmp/opengnsys/debian-repo/oggui/* && mkdir -p /var/tmp/opengnsys/debian-repo/oggui" scp -r ../artifacts/* aptly@172.17.8.68:/var/tmp/opengnsys/debian-repo/oggui/ ''' } @@ -69,8 +69,21 @@ pipeline { } agent { label 'debian-repo' } steps { - sh "aptly repo add opengnsys-devel /var/tmp/opengnsys/debian-repo/oggui/*.deb" - sh "rm -f /var/tmp/opengnsys/debian-repo/oggui/*.deb" + script { + // Construir el patrón de versión esperado en el nombre del paquete + def versionPattern = "${env.TAG_NAME}-${env.BUILD_NUMBER}" + + // Buscar y añadir al repositorio los paquetes que coincidan con el patrón + sh """ + for deb in /var/tmp/opengnsys/debian-repo/oggui/*${versionPattern}*.deb; do + if [ -f "\$deb" ]; then + aptly repo add opengnsys-devel "\$deb" + else + echo "No se encontraron paquetes .deb para la versión ${versionPattern}." + fi + done + """ + } } } }