Remove the Release 1 pipeline files; point everything at Release 2
new_docker_build.sh and rpmbuild/make_rpm_ubuntu26.py (Release 1 validation-scope driver/producer) did not belong to this branch; their functional callers are adapted to the Release 2 files: - rpmbuild/make_rpm_ubuntu26_release2.py: PIPELINE_FILES now packages new_docker_build_release2.sh and make_rpm_ubuntu26_release2.py. - jenkins-ci-rme/jenkins_builder_ubuntu26.sh: runs make_rpm_ubuntu26_release2.py with -DBUILD_RTI=ON and the Release 2 target list (--build_targets; a full-tree build is not possible on this tree); staging tar also excludes ./build4*. - jenkins-ci-rme/release-16-10-2026.sh (local dry run): calls new_docker_build_release2.sh; derives the pipeline root from the tree layout and exports MIGRATE_PIPELINE_ROOT; uses the prebuilt image when present, otherwise the driver installs deps in-container (the R1 --build-prebuilt-image option does not exist in the R2 driver). - jenkins-ci-rme/jenkins/Jenkinsfile: coverage stage runs the R2 driver with MIGRATE_PIPELINE_ROOT exported (wins over the checked-in .envrc, which carries a host-specific path). - Doc/comment updates: Dockerfile header, install_arcgis.sh, publisher, Jenkinsfile descriptions, jenkins-ci-rme/README.md, README.md. Remaining references to the old names are only in historical migration reports, which are left as-is.
This commit is contained in:
1 parent
42f9fbeebe
commit
2b1c3dc241
13 files changed
+71
-2260
No files matched your search
@@ -1,16 +1,16 @@
|
||||
// Build body of the release pipeline for the Qt6-migrated legatus
|
||||
// validation-scope branch (story/release-validation-scope): TetraIF, Z,
|
||||
// Lts/Common (+ Lts/Proxies/TrainingAreaBase) -> 5 release DEB packages.
|
||||
// Release 2 branch: AP3, AP4, AP9, TetraIF, tests (46 targets) ->
|
||||
// 5 release DEB packages.
|
||||
//
|
||||
// Loaded by jenkins-ci-rme/Jenkinsfile inside the allocated node after the
|
||||
// checkout; job properties/parameters live there.
|
||||
//
|
||||
// Workspace layout (checked out by Jenkins, DLBO Qt6 repo):
|
||||
// <WORKSPACE>/
|
||||
// jenkins-ci-rme/Jenkinsfile (entry point)
|
||||
// new_docker_build.sh (local build driver)
|
||||
// rpmbuild/make_rpm_ubuntu26.py (in-tree packaging)
|
||||
// jenkins-ci-rme/ (this pipeline)
|
||||
// jenkins-ci-rme/Jenkinsfile (entry point)
|
||||
// new_docker_build_release2.sh (local build driver)
|
||||
// rpmbuild/make_rpm_ubuntu26_release2.py (in-tree packaging)
|
||||
// jenkins-ci-rme/ (this pipeline)
|
||||
//
|
||||
// The build container image is the prebuilt image shipped in the repo as
|
||||
// legatus-qt6_1.0.tar.gz; it is loaded onto the agent when not installed
|
||||
@@ -65,7 +65,10 @@ def buildOsVersion = { String osVersion ->
|
||||
// The driver (run on the agent, same pattern as the image-build
|
||||
// stage) builds the scope with -O0 --coverage, runs ctest and
|
||||
// collects the lcov report into the workspace mount.
|
||||
sh "bash ./new_docker_build.sh --docker-image ${imageName} --run-coverage --coverage-output-dir ${WORKSPACE}/coverage/${project}/${osVersion}"
|
||||
// MIGRATE_PIPELINE_ROOT must be exported: it points at the checkout
|
||||
// root (the mounted pipeline root) and wins over the checked-in
|
||||
// .envrc, which carries a host-specific path.
|
||||
sh "export MIGRATE_PIPELINE_ROOT='${WORKSPACE}' && bash ./new_docker_build_release2.sh --use-prebuilt-image --docker-image ${imageName} --run-coverage --coverage-output-dir ${WORKSPACE}/coverage/${project}/${osVersion}"
|
||||
archiveArtifacts artifacts: "coverage/${project}/${osVersion}/**", allowEmptyArchive: true
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user