Commit Graph
9 Commits
Author SHA1 Message Date
berrux-dev 679e7a8a9c 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.
2026-11-18 08:39:04 +01:00
berrux-dev 9d0403817e Relocate all test and ctest executables to bin/unit-test
Test binaries (naming: test_* | *_test | *_smoke | *Tests - 26 targets
incl. the ctest-registered ones and pdmTests) now build into
<build>/bin/unit-test/ instead of <build>/bin/.

- CMakeLists: post-processing pass after all add_subdirectory calls sets
  RUNTIME_OUTPUT_DIRECTORY (overrides the legacy EXECUTABLE_OUTPUT_PATH)
  plus a 5-level $ORIGIN BUILD_RPATH entry (from bin/unit-test the RTI
  libs are one level further away than from bin/). Targets are collected
  by walking the SUBDIRECTORIES tree - the global TARGETS property is
  empty under CMake 4.x, which silently broke the first attempt.
- add_test() uses $<TARGET_FILE:...>, so the ctest registry follows the
  new location without changes.
- rpmbuild/make_rpm_ubuntu26*.py: test discovery points at
  build/bin/unit-test; the release2 runtime DEB mirrors the layout into
  usr/bin/unit-test/ so the test binaries stay in the package.
- README: bin/unit-test/ documented in the output list and snippets.

Verified (fresh /workspace-mount build): all 26 test executables in
bin/unit-test/, ctest 20/22 (same 2 pre-existing out-of-scope failures),
RUNPATH carries the 5-level $ORIGIN RTI entry and ddscore_unit_test runs
from bin/unit-test with no LD_LIBRARY_PATH / RTI_LICENSE; app binaries in
bin/ keep their 4-level entry.
2026-11-17 00:48:34 +01:00
berrux-dev dc2c3e358b Move the build tree out of the source tree (fixed ../build)
The build directory is now a fixed 'build' next to the tree
(qt6-after/build), not in-tree build4 / build4_<timestamp>_<pid> dirs.

- CMakeLists: the $ORIGIN RTI RUNPATH entry is now 4 levels up from a
  bin/ or lib/ artifact (the build tree is one level shallower)
- new_docker_build_release2.sh: BUILD_DIR is the fixed ../build; the DEB
  tar drops the ./build4* exclude (the build dir is outside the tree)
- new_docker_build.sh: Docker mounts the tree's parent so ../build lands
  next to the tree on the host; in-container paths (cmake source,
  SRCROOT, deb_stage, rpms, staging tar) updated accordingly
- rpmbuild/make_rpm_ubuntu26*.py: stale build4/ references now say build/
- README: build4 -> ../build in every snippet and doc line

Verified: fresh full-scope configure + ninja all in qt6-after/build is
green; ctest 20/22 (same 2 pre-existing out-of-scope failures as the
previous baseline); RUNPATH carries the 4-level $ORIGIN entry and
ddscore_unit_test runs with no LD_LIBRARY_PATH / RTI_LICENSE.
2026-11-16 22:20:12 +01:00
berrux-dev 262fd226f9 Restore in-scope files missing from the merge and scope-aware CMakeLists
The merge from story/release-validation-scope only carried files that
existed at the common base or on that branch. In-scope files added on
story/release-2-cleanup after the base (per-module unit-test dirs, the
Release 2 driver and rpmbuild script) were missing, breaking
ADD_SUBDIRECTORY(unit-test) references.

- Restore the 33 missing in-scope files from story/release-2-cleanup.
- Lts/Common/CMakeLists.txt and LtsUtilsGui/CMakeLists.txt: take the
  story/release-2-cleanup versions (the validation versions still
  reference out-of-scope subdirectories: httq, LtsRestClient,
  LtsWebSocket, ConnectDialog, StyleManager).
2026-11-16 19:04:24 +01:00
berrux-dev 0e2100f383 reset Jenkins file 2026-10-15 20:43:46 +02:00
berrux-dev 26f702b7a4 reset jenkins file 2026-10-15 20:40:29 +02:00
berrux-dev 493893d2e6 Reduce make_rpm_ubuntu26.py line count (925 to 526) without changing behavior
- Merge build_single_deb and build_single_deb_nobuild into one build_deb()
- Add build_nobuild_package() factory for the 4 no-build packages
- Extract run(), prune_dirs() and write_deb_file() helpers
- Drop the unreachable release_scope copy branch (all call sites used the
  full-tree copy; the --release_scope CLI flag is kept)
- Trim pipeline_files to the 8 files that actually exist and are packaged
- Remove unused imports (configparser, getpass, re, datetime, Path, stat),
  unused vars (test_patterns, script_extensions) and a duplicated write block
2026-10-14 20:25:51 +02:00
berrux-dev 2d1b12b5d8 Copy jenkins-ci-rme into the source tree and adapt it to this project
- Jenkinsfile: guez-only release pipeline; the prebuilt build image is
  built from the in-tree Dockerfile (via new_docker_build.sh
  --build-prebuilt-image) instead of a pre-pulled harbor image; the
  builder runs inside the container with the workspace mounted at
  /workspace; the post-publish cleanup stage was dropped so the DEBs
  stay under ${WORKSPACE}/rpms/... (the documented output location)
- jenkins_builder_ubuntu26.sh: uses the in-tree rpmbuild/
  make_rpm_ubuntu26.py instead of the outer-repo copy; same-file guard
  on the packages-out copy (host output dir == make_rpm output dir)
- jenkins_publisher_ubuntu26.sh: uploads rpms/${PROJECT}/${OS_VERSION}/
  directly - make_rpm_ubuntu26.py writes the DEBs there without a TDS
  subfolder
- release-16-10-2026.sh: local driver adapted to the current
  new_docker_build.sh interface (drops the no-longer-existing
  --use-prebuilt-image option, builds the image on demand, outputs to
  ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/)
- make_rpm_ubuntu26.py: stage the new jenkins-ci-rme/ files (Jenkinsfile,
  builder, publisher) into the build-pipeline DEB (release-16-10-2026.sh
  was already listed)

Not copied (superseded): openSUSE builder/publisher, the old Dockerfile
recipes (replaced by the in-tree Dockerfile), Bitbucket notification
(jenkins_notifier.sh is not part of this project)
2026-10-14 16:28:03 +02:00
berrux-dev ba99b74608 Copy rpmbuild into the source tree with only what the release flow needs
Keep make_rpm_ubuntu26.py (byte-identical to the validated working tree,
including the package-content validator fixes). It is self-contained
(standard library only, no helpers.py import) and its staging artifacts
land in the workspace root, so nothing else from the outer rpmbuild/
directory is needed:

- helpers.py: zero references from the Ubuntu 26 script (belongs to the
  other platform variants)
- make_rpm.py / make_rpm7.py / make_rpm15.1.py / make_rpm15.2.py:
  other platform packaging (base, RHEL7, CentOS 15.x)
- make_rpmModule.py / make_rpmModule7.py: module packaging
- make_rpmSVOnly.py: SV-only packaging
- make_rpm_extfw.py: external framework packaging
- make_tag.py: release tagging tool
- make_license_rpm.sh + ctc_TDS_license.spec.in + ctc_WMS_license.spec.in:
  CTC license RPM flow
- .git (submodule pointer) and .gitignore (no artifacts are created in
  this directory)
2026-10-13 22:33:37 +02:00