Skip to content

Commit 3bd62f8

Browse files
Vitexusclaude
andcommitted
fix: correct paths for monorepo layout and restrict to trixie
Packaging lives in opentelemetry-api/debian/, not debian/ at the repo root. Fix git checkout, dpkg-parsechangelog, debuild-pbuilder working directory, debian/files references, and artifact cleanup paths accordingly. Drop bookworm/forky/jammy/noble until those distributions have sufficient deps. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent c6a57f6 commit 3bd62f8

1 file changed

Lines changed: 9 additions & 12 deletions

File tree

opentelemetry-api/debian/Jenkinsfile

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
// Aktuální verze Pipeline: https://github.com/VitexSoftware/BuildImages/blob/main/Test/Jenkinsfile-parael
44

55
String[] distributions = [
6-
'debian:bookworm',
76
'debian:trixie',
8-
'debian:forky',
9-
'ubuntu:jammy',
10-
'ubuntu:noble'
117
]
128

139
String vendor = 'vitexsoftware'
@@ -41,28 +37,29 @@ distributions.each { distro ->
4137
checkout scm
4238
buildImage = docker.image(imageName)
4339

44-
sh 'git checkout debian/changelog'
40+
sh 'git checkout opentelemetry-api/debian/changelog'
4541
buildVer = sh(
46-
script: "dpkg-parsechangelog --show-field Version",
42+
script: "dpkg-parsechangelog -l opentelemetry-api/debian/changelog --show-field Version",
4743
returnStdout: true
4844
).trim() + ".${env.BUILD_NUMBER}~${distroCode}"
4945
}
5046

5147
stage("Build ${distro}") {
5248
buildImage.inside('--ipc=host') {
5349
sh """
50+
cd opentelemetry-api
5451
dch -b -v ${buildVer} "${env.BUILD_TAG}"
5552
sudo apt-get update --allow-releaseinfo-change
56-
sudo chown -R jenkins:jenkins . ..
53+
sudo chown -R jenkins:jenkins . ../..
5754
debuild-pbuilder -r'sudo -E' -i -us -uc -b
5855
mkdir -p \$WORKSPACE/dist/debian/
5956
rm -rf \$WORKSPACE/dist/debian/*
6057
for deb in \$(awk '{print \$1}' debian/files); do
61-
mv "../\$deb" \$WORKSPACE/dist/debian/
58+
mv "../../\$deb" \$WORKSPACE/dist/debian/
6259
done
6360
"""
6461
artifacts = sh(
65-
script: "awk '{print \$1}' debian/files",
62+
script: "awk '{print \$1}' opentelemetry-api/debian/files",
6663
returnStdout: true
6764
).trim().split('\n')
6865
}
@@ -106,13 +103,13 @@ distributions.each { distro ->
106103

107104
sh '''
108105
set -e
109-
if [ -f debian/files ]; then
106+
if [ -f opentelemetry-api/debian/files ]; then
110107
while read -r file _; do
111108
[ -n "$file" ] || continue
112109
rm -f "dist/debian/$file" || true
113-
rm -f "../$file" || true
110+
rm -f "../../$file" || true
114111
rm -f "$WORKSPACE/$file" || true
115-
done < debian/files
112+
done < opentelemetry-api/debian/files
116113
fi
117114
'''
118115
}

0 commit comments

Comments
 (0)