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,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
|
||||
|
||||
Reference in new issue
Block a user