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,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build the LTS DEB packages for the Qt6-migrated legatus release
|
||||
# (validation scope: TetraIF, Z, Lts/Common + Lts/Proxies/TrainingAreaBase)
|
||||
# (Release 2 scope: AP3, AP4, AP9, TetraIF, tests - 46 targets)
|
||||
# for Ubuntu 26.04.
|
||||
#
|
||||
# Runs inside the prebuilt build container (built from the in-tree
|
||||
@@ -42,6 +42,7 @@ mkdir -p "${STAGE_DIR}"
|
||||
tar --exclude='./rpms' --exclude='./.git' --exclude='./build' \
|
||||
--exclude='./deb_build_tmp' --exclude='./deb_stage' --exclude='./packages-out' \
|
||||
--exclude='./legatus-qt6_1.0.tar.gz' \
|
||||
--exclude='./build4*' \
|
||||
-cf - -C "${WORKSPACE}" . | tar -xf - -C "${STAGE_DIR}"
|
||||
|
||||
export VERSION_DATE
|
||||
@@ -49,20 +50,26 @@ VERSION_DATE=$(date +%Y-%m-%d)
|
||||
|
||||
# CMake project root inside the staged tree (the DLBO Qt6 repo root)
|
||||
SOURCE_DIR="${STAGE_DIR}"
|
||||
if [ ! -f "${SOURCE_DIR}/CMakeLists.txt" ] || [ ! -f "${SOURCE_DIR}/rpmbuild/make_rpm_ubuntu26.py" ]; then
|
||||
echo "ERROR: staged source incomplete under ${SOURCE_DIR} (CMakeLists.txt or rpmbuild/make_rpm_ubuntu26.py missing)" >&2
|
||||
if [ ! -f "${SOURCE_DIR}/CMakeLists.txt" ] || [ ! -f "${SOURCE_DIR}/rpmbuild/make_rpm_ubuntu26_release2.py" ]; then
|
||||
echo "ERROR: staged source incomplete under ${SOURCE_DIR} (CMakeLists.txt or rpmbuild/make_rpm_ubuntu26_release2.py missing)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Release 2 scope targets - mirrors the GROUP*_TARGETS arrays in
|
||||
# new_docker_build_release2.sh (keep in sync). A full-tree build is not
|
||||
# possible on the Release 2 tree, so the scoped list must be passed.
|
||||
RELEASE2_TARGETS=(ddscore ddsftccore ddsfts ddsgen ddsQoS ddsconnector NGLLogger nglapplication nglcompression nglcoreapplication ngldb nglguiapplication nglsettings nglsingleapplication nglsinglecoreapplication ngltools ngltranslator nglwidgets qtsingleapplication qtsinglecoreapplication wms_json_ds tcpserver LtsCoordinate LtsCoordTrans LtsSession LtsMultiMonitor DataPluginInterface GuiPluginInterface CoPrtCnv LogViewLogger LogView PrtCnvLib PrtCnv LtsLicence MockCoordTrans aes_crypt_test ngltools_qt_smoke lts_coord_trans_unit_test test_nglpdfwidget coprtcnv_unit_test logview_unit_test prtcnv_unit_test ddsview LogViewer sqlbrowser ngl_codegen)
|
||||
|
||||
# Output is isolated per OS version so parallel OS builds of the same
|
||||
# project never collide
|
||||
cd "${SOURCE_DIR}/rpmbuild"
|
||||
python3 make_rpm_ubuntu26.py -c LTS \
|
||||
python3 make_rpm_ubuntu26_release2.py -c LTS \
|
||||
--project_name "${PROJECT}" \
|
||||
--version "${LTS_VERSION}" \
|
||||
--output_dir "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/" \
|
||||
--source_dir "${SOURCE_DIR}" \
|
||||
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DRELEASE_BUILD=ON" \
|
||||
--cmake_build_flags "-DUSE_IPO=ON -DUSE_UNITY_BUILD=ON -DGUEZ_MODE=${GUEZ_MODE} -DBUILD_WLS=ON -DPostgreSQL_TYPE_INCLUDE_DIR=/usr/include/postgresql/ -DBUILD_RTI=ON -DRELEASE_BUILD=ON" \
|
||||
--build_targets "${RELEASE2_TARGETS[*]}" \
|
||||
--build_number "${BUILD_NUMBER:-1}" \
|
||||
--release_scope
|
||||
|
||||
|
||||
Reference in new issue
Block a user