Skip to content

Commit f278d60

Browse files
VitexusVitexus
committed
build pipeline update
1 parent d3b273e commit f278d60

2 files changed

Lines changed: 66 additions & 75 deletions

File tree

‎debian/Jenkinsfile‎

Lines changed: 60 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
11
#!groovy
22

3-
// Aktuální verze Pipeline: https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
3+
// Current version of this Pipeline https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
44

5-
String[] distributions = [
6-
'debian:bookworm',
7-
'debian:trixie',
8-
'debian:forky',
9-
'ubuntu:jammy',
10-
'ubuntu:noble'
11-
]
5+
String[] distributions = ['debian:bookworm', 'debian:trixie', 'debian:forky', 'ubuntu:jammy', 'ubuntu:noble']
126

137
String vendor = 'vitexsoftware'
14-
String imagePrefix = 'multiflexi-'
8+
//String distroFamily = ''
159

1610
properties([
1711
copyArtifactPermission('*')
1812
])
19-
20-
node {
13+
node() {
2114
ansiColor('xterm') {
2215
stage('SCM Checkout') {
2316
checkout scm
@@ -26,84 +19,86 @@ node {
2619
}
2720

2821
def branches = [:]
29-
3022
distributions.each { distro ->
3123
branches[distro] = {
32-
def (distroFamily, distroCode) = distro.split(':')
33-
def imageName = "${vendor}/${imagePrefix}${distroCode}:latest"
34-
def buildImage
24+
def distroName = distro
25+
println "Dist:" + distroName
26+
27+
def dist = distroName.split(':')
28+
def distroFamily = dist[0]
29+
def distroCode = dist[1]
30+
def buildImage = ''
3531
def artifacts = []
36-
def buildVer
32+
def buildVer = ''
3733

3834
node {
3935
ansiColor('xterm') {
40-
stage("Checkout ${distro}") {
36+
stage('Checkout ' + distroName) {
4137
checkout scm
38+
def imageName = vendor + '/' + distro
4239
buildImage = docker.image(imageName)
43-
4440
sh 'git checkout debian/changelog'
45-
buildVer = sh(
46-
script: "dpkg-parsechangelog --show-field Version",
41+
def version = sh (
42+
script: 'dpkg-parsechangelog --show-field Version',
4743
returnStdout: true
48-
).trim() + ".${env.BUILD_NUMBER}~${distroCode}"
44+
).trim()
45+
buildVer = version + '.' + env.BUILD_NUMBER + '~' + distroCode
4946
}
50-
51-
stage("Build ${distro}") {
47+
stage('Build ' + distroName) {
5248
buildImage.inside {
53-
sh """
54-
dch -b -v ${buildVer} "${env.BUILD_TAG}"
55-
sudo apt-get update --allow-releaseinfo-change
56-
sudo chown jenkins:jenkins ..
57-
debuild-pbuilder -i -us -uc -b
58-
mkdir -p \$WORKSPACE/dist/debian/
59-
rm -rf \$WORKSPACE/dist/debian/*
60-
for deb in \$(awk '{print \$1}' debian/files); do
61-
mv "../\$deb" \$WORKSPACE/dist/debian/
62-
done
63-
"""
64-
artifacts = sh(
65-
script: "awk '{print \$1}' debian/files",
49+
sh 'dch -b -v ' + buildVer + ' "' + env.BUILD_TAG + '"'
50+
sh 'sudo apt-get update --allow-releaseinfo-change'
51+
sh 'sudo chown jenkins:jenkins ..'
52+
sh 'debuild-pbuilder -r"sudo -E" -i -us -uc -b'
53+
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'
54+
artifacts = sh (
55+
script: "cat debian/files | awk '{print \$1}'",
6656
returnStdout: true
6757
).trim().split('\n')
6858
}
6959
}
7060

71-
stage("Test ${distro}") {
61+
stage('Test ' + distroName) {
7262
buildImage.inside {
73-
def debconf_debug = 0
74-
sh """
75-
cd \$WORKSPACE/dist/debian/
76-
dpkg-scanpackages . /dev/null > Packages
77-
gzip -9c Packages > Packages.gz
78-
cd \$WORKSPACE
79-
echo "deb [trusted=yes] file://///\$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list
80-
sudo apt-get update --allow-releaseinfo-change
81-
"""
82-
artifacts.each { deb_file ->
83-
if (deb_file.endsWith('.deb')) {
84-
def pkgName = deb_file.tokenize('/')[-1].replaceFirst(/_.*/, '')
85-
def distroCodename = sh(
86-
script: "lsb_release -sc",
87-
returnStdout: true
88-
).trim()
89-
echo "Installing ${pkgName} on ${distroCodename}"
90-
sh """
91-
sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=${debconf_debug} \
92-
apt-get -y install ${pkgName} \
93-
|| sudo apt-get -y -f install
94-
"""
63+
def debconf_debug = 0 //Set to "5" or "developer" to debug debconf
64+
sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz; cd $WORKSPACE'
65+
sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
66+
sh 'sudo apt-get update --allow-releaseinfo-change'
67+
sh 'echo "INSTALATION"'
68+
69+
def installOrder = [
70+
// '',
71+
]
72+
73+
def sorted_artifacts = artifacts.toList()
74+
installOrder.each { pkgPrefix ->
75+
def debFile = null
76+
for (item in sorted_artifacts) {
77+
def itemStr = item.toString()
78+
if (itemStr.startsWith(pkgPrefix) && itemStr.endsWith('.deb')) {
79+
debFile = itemStr
80+
break
9581
}
9682
}
83+
if (debFile) {
84+
def pkgName = debFile.tokenize('/')[-1].replaceFirst(/_.*/, '')
85+
sh 'echo -e "${GREEN} installing ' + pkgName + ' on `lsb_release -sc` ${ENDCOLOR} "'
86+
sh 'sudo DEBIAN_FRONTEND=noninteractive DEBCONF_DEBUG=' + debconf_debug + ' apt-get -y install ' + pkgName + ' || sudo apt-get -y -f install'
87+
}
9788
}
98-
}
9989

100-
stage("Archive artifacts ${distro}") {
90+
}
91+
stage('Archive artifacts ' + distroName ) {
92+
// Only run if previous stages (Build and Test) succeeded
10193
buildImage.inside {
94+
// Archive all produced artifacts listed in debian/files
10295
artifacts.each { deb_file ->
103-
println "Archiving artifact: ${deb_file}"
104-
archiveArtifacts artifacts: "dist/debian/${deb_file}"
96+
println "Archiving artifact: " + deb_file
97+
archiveArtifacts artifacts: 'dist/debian/' + deb_file
10598
}
10699

100+
// Cleanup: remove any produced files named in debian/files
101+
// Try both the dist location and any potential original locations referenced by debian/files
107102
sh '''
108103
set -e
109104
if [ -f debian/files ]; then
@@ -117,17 +112,16 @@ distributions.each { distro ->
117112
'''
118113
}
119114
}
120-
121115
}
122116
}
123117
}
124118
}
125-
119+
}
126120

127121
parallel branches
128122

129123
node {
130124
stage('Publish to Aptly') {
131-
publishDebToAptly()
125+
publishDebToAptly()
132126
}
133127
}

‎debian/Jenkinsfile.release‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!groovy
22

3-
// Current version of this Pipeline https://raw.githubusercontent.com/VitexSoftware/multiflexi-buildimages/refs/heads/main/Test/multiflexi-halloworld/Jenkinsfile
4-
53
String[] distributions = ['debian:bookworm', 'debian:trixie', 'debian:forky', 'ubuntu:jammy', 'ubuntu:noble']
64

75
String vendor = 'vitexsoftware'
@@ -45,11 +43,11 @@ distributions.each { distro ->
4543
buildVer = version + '.' + env.BUILD_NUMBER + '~' + distroCode
4644
}
4745
stage('Build ' + distroName) {
48-
buildImage.inside {
46+
buildImage.inside('--ipc=host') {
4947
sh 'dch -b -v ' + buildVer + ' "' + env.BUILD_TAG + '"'
5048
sh 'sudo apt-get update --allow-releaseinfo-change'
51-
sh 'sudo chown jenkins:jenkins ..'
52-
sh 'debuild-pbuilder -i -us -uc -b'
49+
sh 'sudo chown -R jenkins:jenkins . ..'
50+
sh 'debuild-pbuilder -r"sudo -E" -i -us -uc -b'
5351
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'
5452
artifacts = sh (
5553
script: "cat debian/files | awk '{print \$1}'",
@@ -59,7 +57,7 @@ distributions.each { distro ->
5957
}
6058

6159
stage('Test ' + distroName) {
62-
buildImage.inside {
60+
buildImage.inside('--ipc=host') {
6361
def debconf_debug = 0 //Set to "5" or "developer" to debug debconf
6462
sh 'cd $WORKSPACE/dist/debian/ ; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz; cd $WORKSPACE'
6563
sh 'echo "deb [trusted=yes] file://///$WORKSPACE/dist/debian/ ./" | sudo tee /etc/apt/sources.list.d/local.list'
@@ -75,13 +73,12 @@ distributions.each { distro ->
7573
}
7674
stage('Archive artifacts ' + distroName ) {
7775
// Only run if previous stages (Build and Test) succeeded
78-
buildImage.inside {
76+
buildImage.inside('--ipc=host') {
7977
// Archive all produced artifacts listed in debian/files
8078
artifacts.each { deb_file ->
8179
println "Archiving artifact: " + deb_file
8280
archiveArtifacts artifacts: 'dist/debian/' + deb_file
8381
}
84-
8582
// Cleanup: remove any produced files named in debian/files
8683
// Try both the dist location and any potential original locations referenced by debian/files
8784
sh '''
@@ -110,7 +107,7 @@ if (!currentBuild.result || currentBuild.result == 'SUCCESS') {
110107
string(name: 'UPSTREAM_JOB', value: env.JOB_NAME),
111108
string(name: 'UPSTREAM_BUILD', value: env.BUILD_NUMBER),
112109
string(name: 'REMOTE_SSH', value: 'multirepo@repo.multiflexi.eu'),
113-
string(name: 'REMOTE_REPO_DIR', value: '/srv/repo'),
110+
string(name: 'REMOTE_REPO_DIR', value: '/var/lib/multirepo/public/multiflexi'),
114111
string(name: 'COMPONENT', value: 'main'),
115112
string(name: 'DEB_DIST', value: '')
116113
]

0 commit comments

Comments
 (0)