diff --git a/files/FIRST_RELEASE_REPORT.md b/files/FIRST_RELEASE_REPORT.md index 22273ecab..1c1fa5e4c 100644 --- a/files/FIRST_RELEASE_REPORT.md +++ b/files/FIRST_RELEASE_REPORT.md @@ -497,9 +497,42 @@ docker run --rm legatus-qt6-prebuilt:latest bash -c "apt list --installed 2>/dev # Output: libkf6texttemplate-dev/now 6.24.0-0ubuntu1 amd64 [installed,local] ``` -#### Step 5: Generate RPM/DEB Packages (Jenkins Pipeline) +#### Step 5: Generate RPM/DEB Packages Inside Docker (New Feature) -For full package generation, use the Jenkins builder scripts: +The `new_docker_build.sh` script now supports running the Jenkins builder inside the Docker container: + +```bash +cd /path/to/qt6-migration-pipeline/qt-migration-legatus/qt6-after/qt6-migrated-legatus + +# Run Jenkins builder inside Docker with prebuilt image +./new_docker_build.sh --use-prebuilt-image --run-jenkins-builder --package-output-dir ./packages-out +``` + +**Environment Variables (with defaults):** +- `PROJECT=guez` (project name) +- `GUEZ_MODE=ON` (enable guez-specific build logic) +- `LTS_VERSION=1.0` (version string for packages) +- `BUILD_NUMBER=1` (build number) +- `BUILD_TAG=manual-build` (build identifier) +- `OS_VERSION` (auto-detected from /etc/os-release) + +**Expected Results:** +- Exit code: 0 +- DEB packages generated in `./packages-out/` directory (mounted from container) +- Packages for: TetraIF, Z, Lts/Common components +- Build log output in Docker container + +**Package Output:** +``` +./packages-out/ +├── tetraif_1.0-1_amd64.deb +├── z-components_1.0-1_amd64.deb +└── lts-common_1.0-1_amd64.deb +``` + +#### Step 6: Generate RPM/DEB Packages (Jenkins Pipeline - Alternative) + +For full package generation outside Docker, use the Jenkins builder scripts: ```bash # For openSUSE RPM packages @@ -514,9 +547,9 @@ cd /path/to/qt6-migration-pipeline/jenkins-ci-rme - RPM/DEB packages generated in `${WORKSPACE}/rpms/` - Packages for: TetraIF, Z, Lts/Common components -#### Step 6: Verify Generated Packages +#### Step 7: Verify Generated Packages -After running Jenkins builder scripts, verify packages with: +After running Jenkins builder scripts (Step 5 or Step 6), verify packages with: ```bash cd /path/to/qt6-migration-pipeline/qt-migration-legatus/qt6-after/qt6-migrated-legatus @@ -571,6 +604,17 @@ INFO: Package verification: SUCCESS # Combine options for release build with verification ./new_docker_build.sh --use-prebuilt-image --verify-rpm + +# Run Jenkins builder inside Docker to generate RPM/DEB packages +./new_docker_build.sh --use-prebuilt-image --run-jenkins-builder --package-output-dir ./packages-out + +# Full options for Jenkins builder execution +./new_docker_build.sh --use-prebuilt-image --run-jenkins-builder \ + --package-output-dir ./packages-out \ + --lts-version 1.0 \ + --project guez \ + --build-number 1 \ + --build-tag manual-build ``` **Docker Image Details:** @@ -616,7 +660,14 @@ Jenkins jobs using jenkins_builder.sh or jenkins_builder_ubuntu26.sh will automa ## Next Steps -1. **Full RPM Package Build:** Run Jenkins builder scripts to generate actual RPM/DEB packages: +1. **Full RPM Package Build (Option A - Inside Docker):** Use the new `--run-jenkins-builder` option: + ```bash + cd qt-migration-legatus/qt6-after/qt6-migrated-legatus + ./new_docker_build.sh --use-prebuilt-image --run-jenkins-builder --package-output-dir ./packages-out + ``` + Verify DEB packages are generated in `./packages-out/` directory for TetraIF, Z, and Lts/Common components. + +2. **Full RPM Package Build (Option B - Direct Jenkins):** Run Jenkins builder scripts directly: ```bash # For openSUSE ./jenkins-ci-rme/jenkins_builder.sh @@ -634,11 +685,12 @@ Jenkins jobs using jenkins_builder.sh or jenkins_builder_ubuntu26.sh will automa 4. **Documentation:** Update release notes with Qt6 migration changes 5. **Known Test Exclusions** (Documented - Not Blocking Release) - - test_nglpdfwidget: Requires Poppler-Qt6 (external dependency) - nglcomp_test: Qt6 compression library migration issue - - grantlee_parser_smoke: Requires KF6TextTemplate plugin (external dependency) + - grantlee_parser_smoke: Requires KF6TextTemplate plugin (external dependency, parent target not in release scope) - migration_tests_NOT_BUILT: Tests from excluded modules (expected) +**Note:** test_nglpdfwidget is now **passing** after Poppler-Qt6 packages were added to Docker image. + ## Notes - The nested submodule `qt5-legatus-legacy` remains on `story/qt6-migration` branch (correct per release prompt requirements)