Merge origin/main into main

Spoje-NET · Nov 30, 2021 · f223247 · f223247
2 parents 3f61bef + 1d760c5
commit f223247
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -22,13 +22,13 @@ pipeline {
 
         stage('debian-buster') {
             agent {
-                docker { image 'vitexsoftware/debian:oldstable' }
+                docker { image 'vitexsoftware/debian:buster' }
             }
             steps {
                 dir('build/debian/package') {
                     checkout scm
-		            buildPackage()
-		            installPackages()
+	            buildPackage()
+	            installPackages()
                 }
                 stash includes: 'dist/**', name: 'dist-buster'
             }
@@ -42,13 +42,13 @@ pipeline {
 
         stage('debian-bullseye') {
             agent {
-                docker { image 'vitexsoftware/debian:stable' }
+                docker { image 'vitexsoftware/debian:bullseye' }
             }
             steps {
                 dir('build/debian/package') {
                     checkout scm
-		            buildPackage()
-		            installPackages()
+	            buildPackage()
+	            installPackages()
                 }
                 stash includes: 'dist/**', name: 'dist-bullseye'
             }
@@ -62,13 +62,15 @@ pipeline {
 
         stage('debian-bookworm') {
             agent {
-                docker { image 'vitexsoftware/debian:testing' }
+                docker { image 'vitexsoftware/debian:bookworm' }
             }
             steps {
                 dir('build/debian/package') {
                     checkout scm
-		            buildPackage()
-		            installPackages()
+		    sh 'sudo apt update'
+		    sh 'sudo apt install -y php-xml' //TODO: Remove after upstream dependency fix
+	            buildPackage()
+	            installPackages()
                 }
                 stash includes: 'dist/**', name: 'dist-bookworm'
             }
@@ -82,13 +84,13 @@ pipeline {
 
         stage('ubuntu-focal') {
             agent {
-                docker { image 'vitexsoftware/ubuntu:stable' }
+                docker { image 'vitexsoftware/ubuntu:focal' }
             }
             steps {
                 dir('build/debian/package') {
                     checkout scm
-		            buildPackage()
-		            installPackages()
+	            buildPackage()
+	            installPackages()
                 }
                 stash includes: 'dist/**', name: 'dist-focal'
             }
@@ -102,13 +104,13 @@ pipeline {
 
         stage('ubuntu-hirsute') {
             agent {
-                docker { image 'vitexsoftware/ubuntu:testing' }
+                docker { image 'vitexsoftware/ubuntu:hirsute' }
             }
             steps {
                 dir('build/debian/package') {
                     checkout scm
-		            buildPackage()
-		            installPackages()
+	            buildPackage()
+	            installPackages()
                 }
                 stash includes: 'dist/**', name: 'dist-hirsute'
             }
@@ -179,7 +181,7 @@ def buildPackage() {
 def installPackages() {
     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 'echo "deb [trusted=yes] file:////$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
     sh 'sudo apt-get update'
     sh 'echo "${GREEN} INSTALATION ${ENDCOLOR}"'
     sh 'IFS="\n\b"; for package in  `ls $WORKSPACE/dist/debian/ | grep .deb | 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 $package ; done;'