diff --git a/Jenkins/Jenkinsfile-deb-pkg b/Jenkins/Jenkinsfile-deb-pkg index 60ca14f..d9ec6d3 100644 --- a/Jenkins/Jenkinsfile-deb-pkg +++ b/Jenkins/Jenkinsfile-deb-pkg @@ -48,7 +48,18 @@ 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 { script { @@ -71,6 +82,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 { @@ -78,10 +102,3 @@ pipeline { } } } -// stage ('Publish to Debian Repository') { -// agent { label 'debian-repo' } -// steps { -// sh "aptly repo add opengnsys-devel /var/tmp/opengnsys/debian-repo/*.deb" -// } -// } - diff --git a/debian/ogboot.postinst b/debian/ogboot.postinst index 5e5a689..345e02f 100755 --- a/debian/ogboot.postinst +++ b/debian/ogboot.postinst @@ -110,8 +110,8 @@ configure_ipxe(){ git clone $IPXE_REPO /tmp/ipxe_repo if [ ! -f $OGBOOT_ROOT/tftpboot/undionly.kpxe ]; then cd /tmp/ipxe_repo/src - make -s bin/undionly.kpxe EMBED=$OGBOOT_ROOT/tftpboot/ipxe_scripts/dhcp_boot.ipxe - make -s bin-x86_64-efi/ipxe.efi EMBED=$OGBOOT_ROOT/tftpboot/ipxe_scripts/dhcp_boot.ipxe + make -j4 -s bin/undionly.kpxe EMBED=$OGBOOT_ROOT/tftpboot/ipxe_scripts/dhcp_boot.ipxe + make -j4 -s bin-x86_64-efi/ipxe.efi EMBED=$OGBOOT_ROOT/tftpboot/ipxe_scripts/dhcp_boot.ipxe cp bin/undionly.kpxe $OGBOOT_ROOT/tftpboot/ cp bin-x86_64-efi/ipxe.efi $OGBOOT_ROOT/tftpboot/