From 6f16d0753741c522d107834115b0b78db595beb5 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Thu, 27 Mar 2025 07:36:00 +0100 Subject: [PATCH 1/5] 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 + """ + } } } } From 23d2b591f8988b089779bb26bba89850bda2f1ef Mon Sep 17 00:00:00 2001 From: Manuel Aranda Date: Thu, 27 Mar 2025 07:54:02 +0100 Subject: [PATCH 2/5] Updated changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1a0052..2ec8f6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ # Changelog +## [0.10.1] - 2025-3-27 +### Improved +- Mejoras en el comportamiento del arbol de grupos. +- Nueva regexp para controlar las "macs" en la creacion de clientes. + ## [0.10.0] - 2025-3-25 ### Added - Nuevo componenten de estado global. From 49671ed686c7af41757654a44eeb4849ac19d418 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Thu, 27 Mar 2025 08:35:45 +0100 Subject: [PATCH 3/5] Using shared libraries --- Jenkins/Jenkinsfile-deb-pkg | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index d655bae..240d436 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -51,13 +51,8 @@ pipeline { stage('Build') { steps { - dir("${env.BUILD_DIR}") { - 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" - scp -r ../artifacts/* aptly@172.17.8.68:/var/tmp/opengnsys/debian-repo/oggui/ - ''' + script { + construirPaquete(env.BUILD_DIR, "../artifacts", "172.17.8.68", "/var/tmp/opengnsys/debian-repo/oggui") } } } @@ -72,17 +67,7 @@ pipeline { 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 - """ + publicarEnAptly('/var/tmp/opengnsys/debian-repo/oggui', 'opengnsys-devel', versionPattern) } } } From 64fa13f36ff2ae1e3cba2d690787b8e6d23183b4 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Thu, 10 Apr 2025 16:50:26 +0200 Subject: [PATCH 4/5] Publish main in nightly repo --- Jenkins/Jenkinsfile-deb-pkg | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index 240d436..9244a88 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -48,6 +48,19 @@ pipeline { } } } + stage('Generate Changelog (Nightly)'){ + when { + branch 'main' + } + steps { + script { + def devName = params.DEV_NAME ? params.DEV_NAME : env.DEFAULT_DEV_NAME + def devEmail = params.DEV_EMAIL ? params.DEV_EMAIL : env.DEFAULT_DEV_EMAIL + generateDebianChangelog(env.BUILD_DIR, devName, devEmail,"nightly") + } + } + } + stage('Build') { steps { @@ -71,6 +84,19 @@ pipeline { } } } + stage ('Publish to Debian Repository (Nightly)') { + when { + branch 'main' + } + agent { label 'debian-repo' } + steps { + script { + // Construir el patrón de versión esperado en el nombre del paquete + def versionPattern = "-${env.BUILD_NUMBER}~nightly" + publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogboot', 'nightly', versionPattern) + } + } + } } post { always { From 4758190b6d4cfb5f1653026804f4f5eb90a056f0 Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Thu, 10 Apr 2025 16:51:29 +0200 Subject: [PATCH 5/5] Publish main in nightly repo --- Jenkins/Jenkinsfile-deb-pkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index 9244a88..394bc73 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -93,7 +93,7 @@ pipeline { script { // Construir el patrón de versión esperado en el nombre del paquete def versionPattern = "-${env.BUILD_NUMBER}~nightly" - publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogboot', 'nightly', versionPattern) + publicarEnAptly('/var/tmp/opengnsys/debian-repo/oggui', 'nightly', versionPattern) } } }