diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 656d3a3c4..eafbbf930 100755 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -1,6 +1,6 @@ def projects = ['ahtc', 'guez'] -// Maps OsVersion -> BUILD_VERSION env var consumed by rpmbuild/make_rpm.py +// Maps OsVersion -> BUILD_VERSION env var consumed by rpmbuild/make_rpm_ubuntu26.py // (the script looks for lts${BUILD_VERSION}.spec; empty selects specs/lts.spec). // Ubuntu 26.04 is the target platform for Qt6 migration def spec_suffix_for_os = [ @@ -13,9 +13,9 @@ properties([ parameters([ choice(name: 'ProjectName', choices: choice_projects, description: 'LTS project flavor (passed as cmake -D_pname)'), string(name: 'OsVersions', defaultValue: '26.04', description: 'Comma-separated Ubuntu base versions, all built in parallel (selects build container tag and spec variant)'), - string(name: 'LtsVersion', defaultValue: '1.0', description: 'LTS version (major.minor) passed to make_rpm.py --version'), + string(name: 'LtsVersion', defaultValue: '1.0', description: 'LTS version (major.minor) passed to make_rpm_ubuntu26.py --version'), booleanParam(name: 'ClearWorkspace', defaultValue: false, description: 'Clear entire workspace on all nodes used for build'), - booleanParam(name: 'PublishArtifactRepo', defaultValue: true, description: 'Upload produced RPMs to the internal artifact repository') + booleanParam(name: 'PublishArtifactRepo', defaultValue: true, description: 'Upload produced DEB packages to the internal artifact repository') ]) ]) @@ -66,7 +66,7 @@ projects.each { project -> sh "mkdir -p ${rpmsDir}" } - stage("Build RPM ${project} (${osVersion})") { + stage("Build DEB ${project} (${osVersion})") { def imageName = "${BUILD_CONTAINER_REGISTRY}/${BUILD_CONTAINER_PREFIX}/${project}_${osVersion}" def buildContainer = docker.image("${imageName}") def guezMode = (project == 'guez') ? 'ON' : 'OFF'