diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index 794d4cf..0f9cea7 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -48,16 +48,23 @@ 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 { - dir("${env.BUILD_DIR}") { - sh ''' - composer require symfony/flex - 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/ogcore && mkdir -p /var/tmp/opengnsys/debian-repo/ogcore" - scp -r ../artifacts/* aptly@172.17.8.68:/var/tmp/opengnsys/debian-repo/ogcore - ''' + script { + construirPaquete(env.BUILD_DIR, "../artifacts", "172.17.8.68", "/var/tmp/opengnsys/debian-repo/ogcore") } } } @@ -69,8 +76,24 @@ pipeline { } agent { label 'debian-repo' } steps { - sh "aptly repo add opengnsys-devel /var/tmp/opengnsys/debian-repo/ogcore/*.deb" - sh "rm -rf /var/tmp/opengnsys/debian-repo/ogcore/*" + script { + // Construir el patrón de versión esperado en el nombre del paquete + def versionPattern = "${env.TAG_NAME}-${env.BUILD_NUMBER}" + publicarEnAptly('/var/tmp/opengnsys/debian-repo/ogcore', 'opengnsys-devel', versionPattern) + } + } + } + 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/ogcore', 'nightly', versionPattern) + } } } } diff --git a/debian/rules b/debian/rules index 2c521a6..7192816 100755 --- a/debian/rules +++ b/debian/rules @@ -8,5 +8,5 @@ override_dh_auto_build: export COMPOSER_ALLOW_SUPERUSER=1 export APP_ENV=prod dh_auto_build - composer dump-env prod - composer install --no-dev --no-interaction --no-progress --optimize-autoloader + COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer install --no-dev --no-interaction --no-progress --optimize-autoloader + COMPOSER_ALLOW_SUPERUSER=1 APP_ENV=prod composer dump-env prod