dev pipeline update

Author: Vitexus

debian/Jenkinsfile

@@ -1,99 +1,105 @@
 #!groovy
 
+// Current version of this Pipeline https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
 
-String repoUrl = 'https://github.com/raspberrypi/rpi-imager.git'
-String repoBranch = 'qml' // scm.userRemoteConfigs[0].branch
+String[] distributions = ['debian:bookworm', 'debian:trixie', 'debian:forky', 'ubuntu:jammy', 'ubuntu:noble']
 
-String[] architectures = ['amd64', 'aarch64', 'armhf']
-String[] distributions = ['debian:bullseye', 'debian:bookworm', 'ubuntu:focal', 'ubuntu:jammy'] // 'debian:buster'
-
-String imageVendor = 'vitexsoftware'
-String distribution = ''
-String architecture = ''
-String distroCodename = ''
-String ver = ''
+String vendor = 'vitexsoftware'
+String imagePrefix = 'multiflexi-'
+//String distroFamily = ''
 
 properties([
     copyArtifactPermission('*')
 ])
 node() {
     ansiColor('xterm') {
         stage('SCM Checkout') {
-            checkout([$class: 'GitSCM', branches: [[name: '*/' + repoBranch ]], extensions: [], userRemoteConfigs: [[url: repoUrl]]])
-            def control = readFile(file:  env.WORKSPACE + '/debian/control')
-            def lines = control.readLines()
-            for (line in lines) {
-                if (line.trim()) {
-                    def (key,value) = line.split(': ').collect { it.trim() }
-                    if (key == 'Architecture') {
-                        if (value == 'any') {
-                            architectures = ['amd64', 'armhf', 'aarch64']
-                        } else {
-                            architectures = [value]
-                        }
-                    }
-                }
-            }
+            checkout scm
         }
     }
 }
 
-architectures.each {
-    architecture = it
-
-    println 'Arch: ' + architecture
+def branches = [:]
+distributions.each { distro ->
+    branches[distro] = {
+        def distroName = distro
+        println  "Dist:" + distroName
 
-    distributions.each {
-        distribution = it
+        def dist = distroName.split(':')
+        def distroCode = dist[1]
+        def buildImage = ''
+        def artifacts = []
+        def buildVer = ''
 
-        println  'Dist:' + distribution
-
-        def String dist = distribution.split(':')
-        //      distroFamily = dist[0]
-        distroCodename = dist[1]
-
-        def String buildImage = ''
-
-        node(architecture) {
+        node {
             ansiColor('xterm') {
-                stage('Checkout ' + architecture + ' ' + distribution) {
-                    buildImage = docker.image(imageVendor + '/' + distribution)
-                    sh 'cd ' + env.WORKSPACE + '; ls -la; pwd'
+                stage('Checkout ' + distroName) {
+                    checkout scm
+                    def imageName = vendor + '/' + imagePrefix + distroCode + ':latest'
+                    buildImage = docker.image(imageName)
                     sh 'git checkout debian/changelog'
-                    def String pkgVer = sh(
+                    def version = sh (
                         script: 'dpkg-parsechangelog --show-field Version',
                         returnStdout: true
                     ).trim()
-                    ver = pkgVer + '~' + distroCodename + '~' + env.BUILD_NUMBER
+                    buildVer = version + '.' + env.BUILD_NUMBER  + '~' + distroCode
                 }
-                stage('Build ' + architecture + ' ' + distribution) {
+                stage('Build ' + distroName) {
                     buildImage.inside {
-                        sh 'dch -b -v ' + ver  + ' "' + env.BUILD_TAG  + '"'
+                        sh 'dch -b -v ' + buildVer  + ' "' + env.BUILD_TAG  + '"'
                         sh 'sudo apt-get update --allow-releaseinfo-change'
-                        //                        sh 'sudo apt install -y libgnutls28-dev'
                         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 ' + architecture + ' ' + distribution) {
+                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 | gzip -9c > Packages.gz; cd $WORKSPACE'
+                        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"'
-                        sh 'IFS="\n\b"; for package in  `cat debian/files | awk -F_ \'{print \$1}\'` ; do  echo -e "${GREEN} installing ${package} on `lsb_release -sc` ${ENDCOLOR} " ; sudo  DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug  + ' apt-get -y install $WORKSPACE/dist/debian/$package ; done;'
-                        stash includes: 'dist/**', name: 'dist-' + distroCodename
+                        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 ' + architecture + ' ' + distribution ) {
+                stage('Archive artifacts ' + distroName ) {
+                    // Only run if previous stages (Build and Test) succeeded
                     buildImage.inside {
-                        sh 'mv $WORKSPACE/dist/debian/*.deb $WORKSPACE'
+                        // 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