From 189d6b8cb27664e80e8f38400a90d7320998f67e Mon Sep 17 00:00:00 2001 From: Nicolas Arenas Date: Mon, 17 Mar 2025 23:46:09 +0100 Subject: [PATCH] use null values if empty --- Jenkins/Jenkinsfile-deb-pkg | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index 612ed3e..f98dab5 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -1,27 +1,27 @@ @Library('jenkins-shared-library') _ pipeline { - agent { label 'jenkins-slave' } - + agent { + label 'jenkins-slave' + } environment { DEBIAN_FRONTEND = 'noninteractive' DEFAULT_DEV_NAME = 'Default Developer' DEFAULT_DEV_EMAIL = 'default@email.com' - BUILD_DIR = "${WORKSPACE}/oggui" } - options { skipDefaultCheckout() } - parameters { string(name: 'DEV_NAME', defaultValue: '', description: 'Nombre del desarrollador') string(name: 'DEV_EMAIL', defaultValue: '', description: 'Email del desarrollador') } - stages { stage('Prepare Workspace') { steps { - sh "mkdir -p ${env.BUILD_DIR}" + script { + env.BUILD_DIR = "${WORKSPACE}/oggui" + sh "mkdir -p ${env.BUILD_DIR}" + } } } @@ -36,8 +36,8 @@ pipeline { stage('Generate Changelog') { steps { script { - def devName = params.DEV_NAME?.trim() ? params.DEV_NAME : null - def devEmail = params.DEV_EMAIL?.trim() ? params.DEV_EMAIL : null + 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) } @@ -48,13 +48,8 @@ pipeline { steps { dir("${env.BUILD_DIR}") { sh ''' - set -e # Detener ejecución en caso de error - dpkg-buildpackage -us -uc - - mkdir -p ../artifacts - mv ../*.deb ../*.changes ../*.buildinfo ../artifacts/ - + mkdir -p ../artifacts && mv ../*.deb ../*.changes ../*.buildinfo ../artifacts/ ssh aptly@172.17.8.68 "rm -rf /var/tmp/opengnsys/debian-repo && mkdir -p /var/tmp/opengnsys/debian-repo" scp -r ../artifacts/* aptly@172.17.8.68:/var/tmp/opengnsys/debian-repo/ '''