Jenkinsfile update

Author: Vitexus

debian/Jenkinsfile

@@ -1,12 +1,17 @@
 #!groovy
 
-String[] distributions = ['debian:bookworm', 'debian:trixie', 'debian:forky', 'ubuntu:jammy', 'ubuntu:noble']
+// Current version of this Pipeline https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
+
+String[] distributions = [
+    'debian:bookworm',
+    'debian:trixie',
+    'debian:forky',
+    'ubuntu:jammy',
+    'ubuntu:noble'
+]
 
 String vendor = 'vitexsoftware'
-String distribution = ''
 //String distroFamily = ''
-String distroCodename = ''
-String ver = ''
 
 properties([
     copyArtifactPermission('*')
@@ -19,69 +24,97 @@ node() {
     }
 }
 
-distributions.each {
-    distribution = it
-
-    println  "Dist:" + distribution
+def branches = [:]
 
-    def dist = distribution.split(':')
-    distroCodename = dist[1]
+distributions.each { distro ->
+    branches[distro] = {
+        def distroName = distro
+        println  "Dist:" + distroName
 
-    def buildImage = ''
+        def dist = distroName.split(':')
+        def distroFamily = dist[0]
+        def distroCode = dist[1]
+        def buildImage = ''
+        def artifacts = []
+        def buildVer = ''
 
-    def artifacts = []
-
-    node {
-        ansiColor('xterm') {
-            stage('Checkout ' + distribution) {
-                checkout scm
-                buildImage = docker.image(vendor + '/' + distribution)
-                sh 'git checkout debian/changelog'
-                def version = sh (
-                    script: 'dpkg-parsechangelog --show-field Version',
-                    returnStdout: true
-                ).trim()
-                ver = version + '.' + env.BUILD_NUMBER  + '~' + distroCodename
-            }
-            stage('Build ' + distribution) {
-                buildImage.inside {
-                    sh 'dch -b -v ' + ver  + ' "' + env.BUILD_TAG  + '"'
-                    sh 'sudo apt-get update --allow-releaseinfo-change'
-                    sh 'sudo chown jenkins:jenkins ..'
-                    sh 'debuild-pbuilder  -i -us -uc -b'
-                    sh 'mkdir -p $WORKSPACE/dist/debian/ ; rm -rf $WORKSPACE/dist/debian/* ; for deb in $(cat debian/files | awk \'{print $1}\'); do mv "../$deb" $WORKSPACE/dist/debian/; done'
-                    artifacts = sh (
-                        script: "cat debian/files | awk '{print \$1}'",
+        node {
+            ansiColor('xterm') {
+                stage('Checkout ' + distroName) {
+                    checkout scm
+                    def imageName = vendor + '/' + distro
+                    buildImage = docker.image(imageName)
+                    sh 'git checkout debian/changelog'
+                    def version = sh (
+                        script: 'dpkg-parsechangelog --show-field Version',
                         returnStdout: true
-                    ).trim().split('\n')
+                    ).trim()
+                    buildVer = version + '.' + env.BUILD_NUMBER  + '~' + distroCode
+                }
+                stage('Build ' + distroName) {
+                    buildImage.inside {
+                        sh 'dch -b -v ' + buildVer  + ' "' + env.BUILD_TAG  + '"'
+                        sh 'sudo apt-get update --allow-releaseinfo-change'
+                        sh 'sudo chown jenkins:jenkins ..'
+                        sh 'debuild-pbuilder  -i -us -uc -b'
+                        sh 'mkdir -p $WORKSPACE/dist/debian/ ; rm -rf $WORKSPACE/dist/debian/* ; for deb in $(cat debian/files | awk \'{print $1}\'); do mv "../$deb" $WORKSPACE/dist/debian/; done'
+                        artifacts = sh (
+                            script: "cat debian/files | awk '{print \$1}'",
+                            returnStdout: true
+                        ).trim().split('\n')
+                    }
                 }
-            }
 
-            stage('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'
-                    sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
-                    sh 'sudo apt-get update --allow-releaseinfo-change'
-                    sh 'echo "INSTALATION"'
-                    artifacts.each { deb_file ->
-                        if (deb_file.endsWith('.deb')) {
-                            sh 'echo -e "${GREEN} installing ' + deb_file + ' on `lsb_release -sc` ${ENDCOLOR} "'
-                            sh 'sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install $WORKSPACE/dist/debian/' + deb_file
+                stage('Test ' + distroName) {
+                    buildImage.inside {
+                        def debconf_debug = 0 //Set to "5" or "developer" to debug debconf
+                        sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz; cd $WORKSPACE'
+                        sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
+                        sh 'sudo apt-get update --allow-releaseinfo-change'
+                        sh 'echo "INSTALATION"'
+                        artifacts.each { deb_file ->
+                            if (deb_file.endsWith('.deb')) {
+                                def pkgName = deb_file.tokenize('/')[-1].replaceFirst(/_.*/, '')
+                                sh 'echo -e "${GREEN} installing ' + pkgName + ' on `lsb_release -sc` ${ENDCOLOR} "'
+                                sh 'sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install ' + pkgName + ' || sudo apt-get -y -f install'
+                            }
                         }
                     }
                 }
-            }
-            stage('Copy artifacts ' + distribution ) {
-                buildImage.inside {
-                    artifacts.each { deb_file ->
-                        println "Copying artifact: " + deb_file
-                        archiveArtifacts artifacts: 'dist/debian/' + deb_file
-                        sh 'cp $WORKSPACE/dist/debian/' + deb_file + ' $WORKSPACE'
+                stage('Archive artifacts ' + distroName ) {
+                    // Only run if previous stages (Build and Test) succeeded
+                    buildImage.inside {
+                        // Archive all produced artifacts listed in debian/files
+                        artifacts.each { deb_file ->
+                            println "Archiving artifact: " + deb_file
+                            archiveArtifacts artifacts: 'dist/debian/' + deb_file
+                        }
+
+                        // Cleanup: remove any produced files named in debian/files
+                        // Try both the dist location and any potential original locations referenced by debian/files
+                        sh '''
+                            set -e
+                            if [ -f debian/files ]; then
+                              while read -r file _; do
+                                [ -n "$file" ] || continue
+                                rm -f "dist/debian/$file" || true
+                                rm -f "../$file" || true
+                                rm -f "$WORKSPACE/$file" || true
+                              done < debian/files
+                            fi
+                        '''
                     }
                 }
             }
         }
     }
 }
 
+
+parallel branches
+
+node {
+    stage('Publish to Aptly') {
+        publishDebToAptly()
+    }
+}