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
@@ -8,9 +8,9 @@
|
||||
properties([
|
||||
disableConcurrentBuilds(),
|
||||
parameters([
|
||||
choice(name: 'ProjectName', choices: ['guez'], description: 'LTS project flavor (passed to make_rpm_ubuntu26.py --project_name)'),
|
||||
choice(name: 'ProjectName', choices: ['guez'], description: 'LTS project flavor (passed to make_rpm_ubuntu26_release2.py --project_name)'),
|
||||
string(name: 'OsVersions', defaultValue: '26.04', description: 'Comma-separated Ubuntu base versions, built sequentially'),
|
||||
string(name: 'LtsVersion', defaultValue: '1.0', description: 'LTS version (major.minor) passed to make_rpm_ubuntu26.py --version'),
|
||||
string(name: 'LtsVersion', defaultValue: '1.0', description: 'LTS version (major.minor) passed to make_rpm_ubuntu26_release2.py --version'),
|
||||
booleanParam(name: 'ClearWorkspace', defaultValue: false, description: 'Clear entire workspace used for build'),
|
||||
booleanParam(name: 'PublishArtifactRepo', defaultValue: true, description: 'Upload produced DEBs to the internal artifact repository'),
|
||||
booleanParam(name: 'RunCoverage', defaultValue: true, description: 'Build the release scope with -O0 --coverage, run ctest, collect the lcov report and archive it')
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# jenkins-ci-rme — release pipeline for the Qt6 validation-scope branch
|
||||
# jenkins-ci-rme — release pipeline for the Qt6 Release 2 branch
|
||||
|
||||
In-tree copy of the Jenkins CI flow, adapted so the release pipeline depends
|
||||
only on files inside this source tree:
|
||||
@@ -7,9 +7,9 @@ only on files inside this source tree:
|
||||
|---|---|
|
||||
| `Jenkinsfile` | Jenkins entry point (job script path `jenkins-ci-rme/Jenkinsfile`): job properties/parameters, build node, checkout with submodules, then `load`s `jenkins-ci-rme/jenkins/Jenkinsfile` |
|
||||
| `jenkins/Jenkinsfile` | Build body (per OS version, sequentially): install the prebuilt image from `legatus-qt6_1.0.tar.gz` when missing, run the builder inside the container, coverage, publish the DEBs to the artifact repo |
|
||||
| `jenkins_builder_ubuntu26.sh` | Runs **inside** the build container: stages the workspace, runs the in-tree `rpmbuild/make_rpm_ubuntu26.py`, copies the DEBs to the packages-out mount |
|
||||
| `jenkins_builder_ubuntu26.sh` | Runs **inside** the build container: stages the workspace, runs the in-tree `rpmbuild/make_rpm_ubuntu26_release2.py` with the Release 2 target list, copies the DEBs to the packages-out mount |
|
||||
| `jenkins_publisher_ubuntu26.sh` | Runs on the Jenkins agent: uploads the DEBs from `${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/` to the internal artifact repository |
|
||||
| `release-16-10-2026.sh` | Local driver: the same flow without Jenkins, through the in-tree `new_docker_build.sh` |
|
||||
| `release-16-10-2026.sh` | Local driver: the same flow without Jenkins, through the in-tree `new_docker_build_release2.sh` |
|
||||
|
||||
## Not included (superseded)
|
||||
|
||||
@@ -23,27 +23,29 @@ only on files inside this source tree:
|
||||
|
||||
## Adaptations vs. the outer-repo copy
|
||||
|
||||
- Packaging uses the **in-tree** `rpmbuild/make_rpm_ubuntu26.py`
|
||||
- Packaging uses the **in-tree** `rpmbuild/make_rpm_ubuntu26_release2.py`
|
||||
(was `${WORKSPACE}/rpmbuild` from the outer repo)
|
||||
- The prebuilt build image `legatus-qt6:1.0` ships in the repo as
|
||||
`legatus-qt6_1.0.tar.gz` (repo root); Jenkins `docker load`s it only when
|
||||
the image is not installed on the agent yet, and never builds it
|
||||
- `MIGRATE_PIPELINE_ROOT` is no longer needed: `new_docker_build.sh`
|
||||
derives it from its own location
|
||||
- `MIGRATE_PIPELINE_ROOT` is exported by the local dry run (derived from the
|
||||
tree location); `new_docker_build_release2.sh` falls back to its own
|
||||
location when it is not set
|
||||
- DEB output path: `${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/` (Jenkins
|
||||
convention); the packages-out copy is skipped when that directory is the
|
||||
make_rpm output dir (same device:inode guard as in `new_docker_build.sh`)
|
||||
make_rpm output dir (same device:inode guard as in
|
||||
`new_docker_build_release2.sh`)
|
||||
- Publisher uploads `${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/` directly —
|
||||
`make_rpm_ubuntu26.py` writes the DEBs there without a TDS subfolder
|
||||
`make_rpm_ubuntu26_release2.py` writes the DEBs there without a TDS subfolder
|
||||
- The post-publish Cleanup stage was dropped: the DEBs are kept under
|
||||
`${WORKSPACE}/rpms/...` (the documented output location)
|
||||
|
||||
## Local run
|
||||
|
||||
```bash
|
||||
cd "DLBO Qt6"
|
||||
cd <pipeline root>/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
bash ./jenkins-ci-rme/release-16-10-2026.sh
|
||||
# DEBs: <repo-root>/rpms/guez/26.04/
|
||||
# DEBs: <pipeline root>/rpms/guez/26.04/
|
||||
```
|
||||
|
||||
## Jenkins setup
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build the LTS DEB packages for the Qt6-migrated legatus release
|
||||
# (validation scope: TetraIF, Z, Lts/Common + Lts/Proxies/TrainingAreaBase)
|
||||
# (Release 2 scope: AP3, AP4, AP9, TetraIF, tests - 46 targets)
|
||||
# for Ubuntu 26.04.
|
||||
#
|
||||
# Runs inside the prebuilt build container (built from the in-tree
|
||||
@@ -42,6 +42,7 @@ mkdir -p "${STAGE_DIR}"
|
||||
tar --exclude='./rpms' --exclude='./.git' --exclude='./build' \
|
||||
--exclude='./deb_build_tmp' --exclude='./deb_stage' --exclude='./packages-out' \
|
||||
--exclude='./legatus-qt6_1.0.tar.gz' \
|
||||
--exclude='./build4*' \
|
||||
-cf - -C "${WORKSPACE}" . | tar -xf - -C "${STAGE_DIR}"
|
||||
|
||||
export VERSION_DATE
|
||||
@@ -49,20 +50,26 @@ VERSION_DATE=$(date +%Y-%m-%d)
|
||||
|
||||
# CMake project root inside the staged tree (the DLBO Qt6 repo root)
|
||||
SOURCE_DIR="${STAGE_DIR}"
|
||||
if [ ! -f "${SOURCE_DIR}/CMakeLists.txt" ] || [ ! -f "${SOURCE_DIR}/rpmbuild/make_rpm_ubuntu26.py" ]; then
|
||||
echo "ERROR: staged source incomplete under ${SOURCE_DIR} (CMakeLists.txt or rpmbuild/make_rpm_ubuntu26.py missing)" >&2
|
||||
if [ ! -f "${SOURCE_DIR}/CMakeLists.txt" ] || [ ! -f "${SOURCE_DIR}/rpmbuild/make_rpm_ubuntu26_release2.py" ]; then
|
||||
echo "ERROR: staged source incomplete under ${SOURCE_DIR} (CMakeLists.txt or rpmbuild/make_rpm_ubuntu26_release2.py missing)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Release 2 scope targets - mirrors the GROUP*_TARGETS arrays in
|
||||
# new_docker_build_release2.sh (keep in sync). A full-tree build is not
|
||||
# possible on the Release 2 tree, so the scoped list must be passed.
|
||||
RELEASE2_TARGETS=(ddscore ddsftccore ddsfts ddsgen ddsQoS ddsconnector NGLLogger nglapplication nglcompression nglcoreapplication ngldb nglguiapplication nglsettings nglsingleapplication nglsinglecoreapplication ngltools ngltranslator nglwidgets qtsingleapplication qtsinglecoreapplication wms_json_ds tcpserver LtsCoordinate LtsCoordTrans LtsSession LtsMultiMonitor DataPluginInterface GuiPluginInterface CoPrtCnv LogViewLogger LogView PrtCnvLib PrtCnv LtsLicence MockCoordTrans aes_crypt_test ngltools_qt_smoke lts_coord_trans_unit_test test_nglpdfwidget coprtcnv_unit_test logview_unit_test prtcnv_unit_test ddsview LogViewer sqlbrowser ngl_codegen)
|
||||
|
||||
# Output is isolated per OS version so parallel OS builds of the same
|
||||
# project never collide
|
||||
cd "${SOURCE_DIR}/rpmbuild"
|
||||
python3 make_rpm_ubuntu26.py -c LTS \
|
||||
python3 make_rpm_ubuntu26_release2.py -c LTS \
|
||||
--project_name "${PROJECT}" \
|
||||
--version "${LTS_VERSION}" \
|
||||
--output_dir "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/" \
|
||||
--source_dir "${SOURCE_DIR}" \
|
||||
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DRELEASE_BUILD=ON" \
|
||||
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DBUILD_RTI=ON -DRELEASE_BUILD=ON" \
|
||||
--build_targets "${RELEASE2_TARGETS[*]}" \
|
||||
--build_number "${BUILD_NUMBER:-1}" \
|
||||
--release_scope
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
# ${WORKSPACE}/url-${PROJECT}-${OS_VERSION}.txt — browseable URL of the uploaded folder
|
||||
# ${WORKSPACE}/tdsversion-${PROJECT}-${OS_VERSION}.txt — full version string (LTS-build)
|
||||
#
|
||||
# Adapted for the in-tree flow: make_rpm_ubuntu26.py writes the DEBs
|
||||
# Adapted for the in-tree flow: make_rpm_ubuntu26_release2.py writes the DEBs
|
||||
# directly under ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/ (no TDS
|
||||
# subfolder), so that directory is uploaded as-is.
|
||||
#
|
||||
|
||||
@@ -1,27 +1,30 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Local release pipeline for the Qt6-migrated legatus validation scope
|
||||
# (TetraIF, Z, Lts/Common + Lts/Proxies/TrainingAreaBase).
|
||||
# Local release pipeline for the Qt6-migrated legatus Release 2 scope
|
||||
# (AP3, AP4, AP9, TetraIF, tests - 46 targets).
|
||||
#
|
||||
# Runs the in-tree new_docker_build.sh:
|
||||
# - builds the prebuilt Docker image from the in-tree Dockerfile when the
|
||||
# image is not present yet
|
||||
# Runs the in-tree new_docker_build_release2.sh:
|
||||
# - uses the prebuilt Docker image when present; otherwise the driver
|
||||
# installs the dependencies in-container from the base image (slower)
|
||||
# - builds the release scope, runs ctest and produces the release DEB
|
||||
# packages with the in-tree rpmbuild script
|
||||
# - collects the lcov code-coverage report (--run-coverage; set
|
||||
# DRYRUN_COVERAGE=OFF to skip)
|
||||
#
|
||||
# The DEB packages land in ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/
|
||||
# (Jenkins-style layout; locally WORKSPACE is the pipeline root).
|
||||
# The DEB packages land in ${MIGRATE_PIPELINE_ROOT}/rpms/${PROJECT}/${OS_VERSION}/
|
||||
# (Jenkins-style layout; locally the pipeline root is the directory that
|
||||
# contains qt-migration-legatus/).
|
||||
#
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LEGATUS_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
||||
PIPELINE_ROOT="${LEGATUS_ROOT}"
|
||||
# Tree layout: <pipeline root>/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
PIPELINE_ROOT="$(cd "${LEGATUS_ROOT}/../../.." && pwd)"
|
||||
|
||||
# Release build configuration (Jenkins-style variables)
|
||||
export WORKSPACE="${PIPELINE_ROOT}"
|
||||
export MIGRATE_PIPELINE_ROOT="${MIGRATE_PIPELINE_ROOT:-${PIPELINE_ROOT}}"
|
||||
export PROJECT="${PROJECT:-guez}"
|
||||
export OS_VERSION="${OS_VERSION:-26.04}"
|
||||
export LTS_VERSION="${LTS_VERSION:-1.0}"
|
||||
@@ -45,15 +48,19 @@ log_info "Package output: ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/"
|
||||
|
||||
cd "${LEGATUS_ROOT}"
|
||||
|
||||
# Build the prebuilt image from the in-tree Dockerfile when not present yet
|
||||
# (--build-prebuilt-image builds the image and exits)
|
||||
if ! docker image inspect "${DOCKER_IMAGE}" >/dev/null 2>&1; then
|
||||
log_info "Prebuilt image not found - building it from the in-tree Dockerfile..."
|
||||
bash ./new_docker_build.sh --build-prebuilt-image --docker-image "${DOCKER_IMAGE}"
|
||||
# Use the prebuilt image when present; otherwise let the driver install the
|
||||
# dependencies in-container from the base image (slower, no image build).
|
||||
PREBUILT_FLAG=()
|
||||
if docker image inspect "${DOCKER_IMAGE}" >/dev/null 2>&1; then
|
||||
PREBUILT_FLAG=(--use-prebuilt-image)
|
||||
log_info "Using prebuilt image ${DOCKER_IMAGE}"
|
||||
else
|
||||
log_info "Prebuilt image ${DOCKER_IMAGE} not found - the driver will install dependencies in-container"
|
||||
fi
|
||||
|
||||
# Release scope build + ctest + DEB production (in-tree rpmbuild)
|
||||
bash ./new_docker_build.sh \
|
||||
bash ./new_docker_build_release2.sh \
|
||||
"${PREBUILT_FLAG[@]}" \
|
||||
--docker-image "${DOCKER_IMAGE}" \
|
||||
--run-jenkins-builder \
|
||||
--package-output-dir "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/" \
|
||||
@@ -66,7 +73,8 @@ bash ./new_docker_build.sh \
|
||||
# DRYRUN_COVERAGE=OFF for a fast local DEB-only run.
|
||||
DRYRUN_COVERAGE="${DRYRUN_COVERAGE:-ON}"
|
||||
if [[ "${DRYRUN_COVERAGE}" == "ON" ]]; then
|
||||
bash ./new_docker_build.sh \
|
||||
bash ./new_docker_build_release2.sh \
|
||||
"${PREBUILT_FLAG[@]}" \
|
||||
--docker-image "${DOCKER_IMAGE}" \
|
||||
--run-coverage \
|
||||
--coverage-output-dir "${WORKSPACE}/coverage/${PROJECT}/${OS_VERSION}"
|
||||
|
||||
Reference in new issue
Block a user