Consolidate the Release 2 driver into new_docker_build.sh

- new_docker_build.sh is now the Release 2 scope driver (4 build groups,
  61 targets, Ninja/RelWithDebInfo, /repo mount, 22-test ctest, DEB via
  rpmbuild/make_rpm_ubuntu26_release2.py); the separate
  new_docker_build_release2.sh driver is removed.
- The Docker image recipe is the in-tree Dockerfile (single source of
  truth): Ubuntu 26.04 + apt deps (incl. libbz2-dev, libkf6texttemplate-dev)
  + Qt 6.10.2 via aqtinstall + KDReports from source + ENV
  PATH/CMAKE_PREFIX_PATH. The driver builds the image from it when it is
  missing; --no-prebuilt-image now forces a rebuild (the in-container apt
  path and the inline recipe are gone). Default image: legatus-qt6:1.0.
- rpmbuild/make_rpm_ubuntu26_release2.py: bundle new_docker_build.sh in
  the build-pipeline DEB.
- jenkins-ci-rme/release-16-10-2026.sh: drop the --build-prebuilt-image
  step (no longer an option; the driver auto-builds the image when
  missing).
- README.md: document the Release 2 driver, the 22-test ctest baseline,
  the real DEB layout, the options and the known quirks.
This commit is contained in:
berrux-dev committed 2026-11-18 08:39:04 +01:00
1 parent b18ac87565
commit 679e7a8a9c
6 files changed
+366 -1272

No files matched your search

@@ -1,11 +1,11 @@
#!/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 Lts services + core stack, AP4 DDS, AP9 Viewer/tools/generators).
#
# 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.sh (Release 2 driver):
# - builds the prebuilt Docker image from the in-tree Dockerfile
# when the image is not present yet
# - 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
@@ -45,14 +45,10 @@ 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}"
fi
# (The driver auto-builds the prebuilt image from the in-tree Dockerfile
# when the image is not present yet.)
# Release scope build + ctest + DEB production (in-tree rpmbuild)
# Release 2 scope build + ctest + DEB production (in-tree rpmbuild)
bash ./new_docker_build.sh \
--docker-image "${DOCKER_IMAGE}" \
--run-jenkins-builder \