Jenkinsfile update

Author: Vitexus

debian/Jenkinsfile

@@ -1,6 +1,6 @@
 #!groovy
 
-// Aktuální verze Pipeline: https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
+// Current version of this Pipeline https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
 
 String[] distributions = [
     'debian:bookworm',
@@ -11,13 +11,12 @@ String[] distributions = [
 ]
 
 String vendor = 'vitexsoftware'
-String imagePrefix = 'multiflexi-'
+//String distroFamily = ''
 
 properties([
     copyArtifactPermission('*')
 ])
-
-node {
+node() {
     ansiColor('xterm') {
         stage('SCM Checkout') {
             checkout scm
@@ -29,81 +28,70 @@ def branches = [:]
 
 distributions.each { distro ->
     branches[distro] = {
-        def (distroFamily, distroCode) = distro.split(':')
-        def imageName = "${vendor}/${imagePrefix}${distroCode}:latest"
-        def buildImage
+        def distroName = distro
+        println  "Dist:" + distroName
+
+        def dist = distroName.split(':')
+        def distroFamily = dist[0]
+        def distroCode = dist[1]
+        def buildImage = ''
         def artifacts = []
-        def buildVer
+        def buildVer = ''
 
         node {
             ansiColor('xterm') {
-                stage("Checkout ${distro}") {
+                stage('Checkout ' + distroName) {
                     checkout scm
+                    def imageName = vendor + '/' + distro
                     buildImage = docker.image(imageName)
-
                     sh 'git checkout debian/changelog'
-                    buildVer = sh(
-                        script: "dpkg-parsechangelog --show-field Version",
+                    def version = sh (
+                        script: 'dpkg-parsechangelog --show-field Version',
                         returnStdout: true
-                    ).trim() + ".${env.BUILD_NUMBER}~${distroCode}"
+                    ).trim()
+                    buildVer = version + '.' + env.BUILD_NUMBER  + '~' + distroCode
                 }
-
-                stage("Build ${distro}") {
+                stage('Build ' + distroName) {
                     buildImage.inside {
-                        sh """
-                            dch -b -v ${buildVer} "${env.BUILD_TAG}"
-                            sudo apt-get update --allow-releaseinfo-change
-                            sudo chown jenkins:jenkins ..
-                            debuild-pbuilder -i -us -uc -b
-                            mkdir -p \$WORKSPACE/dist/debian/
-                            rm -rf \$WORKSPACE/dist/debian/*
-                            for deb in \$(awk '{print \$1}' debian/files); do
-                              mv "../\$deb" \$WORKSPACE/dist/debian/
-                            done
-                        """
-                        artifacts = sh(
-                            script: "awk '{print \$1}' debian/files",
+                        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 ${distro}") {
+                stage('Test ' + distroName) {
                     buildImage.inside {
-                        def debconf_debug = 0
-                        sh """
-                            cd \$WORKSPACE/dist/debian/
-                            dpkg-scanpackages . /dev/null > Packages
-                            gzip -9c Packages > Packages.gz
-                            cd \$WORKSPACE
-                            echo "deb [trusted=yes] file://///\$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
-                            sudo apt-get update --allow-releaseinfo-change
-                        """
+                        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(/_.*/, '')
-                                def distroCodename = sh(
-                                    script: "lsb_release -sc",
-                                    returnStdout: true
-                                ).trim()
-                                echo "Installing ${pkgName} on ${distroCodename}"
-                                sh """
-                                    sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=${debconf_debug} \
-                                         apt-get -y install ${pkgName} \
-                                    || sudo apt-get -y -f install
-                                """
+                                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("Archive artifacts ${distro}") {
+                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}"
+                            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
@@ -117,7 +105,6 @@ distributions.each { distro ->
                         '''
                     }
                 }
-
             }
         }
     }