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:
1 parent
b18ac87565
commit
679e7a8a9c
6 files changed
+366
-1272
No files matched your search
@@ -6,7 +6,7 @@ needs Docker.
|
||||
|
||||
## Scope
|
||||
|
||||
`new_docker_build_release2.sh` builds the Release 2 scope in four
|
||||
`new_docker_build.sh` builds the Release 2 scope in four
|
||||
groups (all ON by default, toggle with `--groupN` / `--no-groupN`):
|
||||
|
||||
| Group | Area | Contents |
|
||||
@@ -21,9 +21,9 @@ groups (all ON by default, toggle with `--groupN` / `--no-groupN`):
|
||||
|
||||
Entries at the tree root:
|
||||
|
||||
- `new_docker_build_release2.sh` — build driver (compile, ctest, DEB packaging)
|
||||
- `new_docker_build.sh` — build driver (compile, ctest, DEB packaging)
|
||||
- `rpmbuild/make_rpm_ubuntu26_release2.py` — in-tree DEB package producer (self-contained)
|
||||
- `Dockerfile` — image recipe kept for the legacy validation-scope driver and for the `qt6-release-build-pipeline` DEB; the Release 2 driver carries the same recipe built in and builds the image automatically when it is missing
|
||||
- `Dockerfile` — the image recipe (single source of truth); the driver builds the image from it when the image is missing or when `--no-prebuilt-image` forces a rebuild (also bundled into the `qt6-release-build-pipeline` DEB)
|
||||
- `rti_license.dat` — RTI Connext DDS license, required by the DDS group (GROUP1)
|
||||
- `jenkins-ci-rme/` — in-tree copy of the Jenkins CI flow (see its own `README.md`; still wired to the legacy driver, see Step 5)
|
||||
- `../build/` — build tree, created by the driver **next to the tree** (`qt6-after/build`), never inside it (git-ignored scratch area)
|
||||
@@ -60,21 +60,23 @@ All commands below are run **from this directory**
|
||||
## Step 1 — Build the prebuilt Docker image (once)
|
||||
|
||||
```bash
|
||||
./new_docker_build_release2.sh --docker-image legatus-qt6:1.0
|
||||
./new_docker_build.sh --docker-image legatus-qt6:1.0
|
||||
```
|
||||
|
||||
`--docker-image` selects the prebuilt-image mode: if the named image
|
||||
does not exist yet, the driver builds it automatically from its
|
||||
built-in recipe (Ubuntu 26.04 base, apt deps, Qt 6.10.2 via
|
||||
does not exist yet, the driver builds it automatically from the
|
||||
in-tree `./Dockerfile` (Ubuntu 26.04 base, apt deps, Qt 6.10.2 via
|
||||
`aqtinstall`, KDReports from source) and continues with the build.
|
||||
The default image name is `qt6-migrated-legatus-release2`. This driver
|
||||
`--no-prebuilt-image` forces a (re)build of the image from
|
||||
`./Dockerfile` before running.
|
||||
The default image name is `legatus-qt6:1.0`. This driver
|
||||
has no `--build-prebuilt-image` / `--delete-prebuilt-image` options —
|
||||
manage the image with plain `docker` if needed.
|
||||
|
||||
## Step 2 — Build the Release 2 scope
|
||||
|
||||
```bash
|
||||
./new_docker_build_release2.sh --docker-image legatus-qt6:1.0 \
|
||||
./new_docker_build.sh --docker-image legatus-qt6:1.0 \
|
||||
> build.log 2>&1
|
||||
```
|
||||
|
||||
@@ -203,7 +205,7 @@ prefix** the configure used (the driver mounts the pipeline root at
|
||||
## Step 4 — Produce the release DEB packages
|
||||
|
||||
```bash
|
||||
./new_docker_build_release2.sh --docker-image legatus-qt6:1.0 \
|
||||
./new_docker_build.sh --docker-image legatus-qt6:1.0 \
|
||||
--run-jenkins-builder \
|
||||
> /path/to/build.log 2>&1
|
||||
```
|
||||
@@ -244,10 +246,9 @@ dpkg -c "<pipeline-root>/rpms/guez/26.04/qt6-release-ctest-runtime_1.0-1_amd64.d
|
||||
## Step 5 — CI / Jenkins flow (optional)
|
||||
|
||||
The in-tree `jenkins-ci-rme/` directory contains the full Jenkins
|
||||
pipeline (`Jenkinsfile`, builder, publisher) adapted to this tree.
|
||||
**Note:** it is still wired to the legacy `new_docker_build.sh`
|
||||
driver and has not been switched to `new_docker_build_release2.sh`
|
||||
yet. See `jenkins-ci-rme/README.md` for the pipeline details.
|
||||
pipeline (`Jenkinsfile`, builder, publisher) adapted to this tree; the
|
||||
in-tree flow calls `new_docker_build.sh` (the Release 2 driver). See
|
||||
`jenkins-ci-rme/README.md` for the pipeline details.
|
||||
|
||||
## Step 6 — Code coverage (lcov)
|
||||
|
||||
@@ -260,7 +261,7 @@ coverage step.
|
||||
|
||||
## Options reference
|
||||
|
||||
`./new_docker_build_release2.sh --help` prints the full option list.
|
||||
`./new_docker_build.sh --help` prints the full option list.
|
||||
The main ones:
|
||||
|
||||
| Option | Default | Purpose |
|
||||
@@ -271,8 +272,8 @@ The main ones:
|
||||
| `--group6` / `--no-group6` | ON | Generators (AP9) |
|
||||
| `--no-ctest` | — | skip the ctest step |
|
||||
| `--tests-only` | — | see Known quirks |
|
||||
| `--use-prebuilt-image` / `--no-prebuilt-image` | off | prebuilt image mode (`--docker-image` turns it on) |
|
||||
| `--docker-image IMAGE` | `qt6-migrated-legatus-release2` | image to use (auto-built if missing) |
|
||||
| `--use-prebuilt-image` / `--no-prebuilt-image` | on | use the image (build from `./Dockerfile` if missing) / force a rebuild from `./Dockerfile` |
|
||||
| `--docker-image IMAGE` | `legatus-qt6:1.0` | image to use (auto-built if missing) |
|
||||
| `--cmake_build_flags FLAGS` | — | extra `-D` flags appended to the configure |
|
||||
| `--docker-mount-root PATH` | `/repo` | container-side mount root |
|
||||
| `--run-jenkins-builder` | off | produce the DEB packages (Step 4) |
|
||||
@@ -318,7 +319,3 @@ Environment overrides: `BUILD_GROUP1/3/5/6`, `RUN_CTEST`, `TESTS_ONLY`,
|
||||
- `--tests-only` is documented in `--help` as "run only ctest, skip all
|
||||
build groups", but the current implementation only skips the ctest
|
||||
step; the group builds still run.
|
||||
- The legacy driver `new_docker_build.sh` (validation scope) is kept in
|
||||
the tree and is still used by `jenkins-ci-rme/`; its in-tree
|
||||
`Dockerfile` recipe does not include `libbz2-dev` (BZip2), which the
|
||||
Release 2 driver's built-in recipe does.
|
||||
Reference in new issue
Block a user