diff --git a/Test/Jenkinsfile-noarch b/Test/Jenkinsfile-noarch index 59848a3..c3720c0 100644 --- a/Test/Jenkinsfile-noarch +++ b/Test/Jenkinsfile-noarch @@ -1,6 +1,6 @@ #!groovy -String[] distributions = ['debian:buster', 'debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy', 'ubuntu:kinetic'] +String[] distributions = ['debian:bullseye', 'debian:bookworm', 'debian:trixie', 'ubuntu:focal', 'ubuntu:jammy', 'ubuntu:noble'] String vendor = 'vitexsoftware' String distribution = '' @@ -34,12 +34,12 @@ distributions.each { ansiColor('xterm') { stage('Checkout ' + distribution) { buildImage = docker.image(vendor + '/' + distribution) - sh 'git checkout debian/changelog' - def VERSION = sh ( + sh 'git checkout debian/changelog' + def version = sh ( script: 'dpkg-parsechangelog --show-field Version', returnStdout: true ).trim() - ver = VERSION + '~' + distroCodename + '~' + env.BUILD_NUMBER + ver = version + '.' + env.BUILD_NUMBER + '~' + distroCodename } stage('Build ' + distribution) { buildImage.inside { @@ -51,7 +51,7 @@ distributions.each { } } - stage('Test ' + distribution) { + stage('Package installation Test ' + distribution) { buildImage.inside { def debconf_debug = 0 //Set to "5" or "developer" to debug debconf sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd $WORKSPACE'