Drop the rti_license.dat requirement from the release scope build
The release validation scope (TetraIF, Z/src, Lts/Common + TrainingAreaBase) never consumes an RTI license: no CMake file or build step reads RTI_LICENSE_FILE, and the only RTI Connext DDS consumers are all behind BUILD_RTI (OFF for this branch, stubs compiled instead). The license was pure plumbing: - new_docker_build.sh: remove the require_file validation, the bind mount and the in-container RTI_LICENSE_FILE export - jenkins-ci-rme: remove the RTI_LICENSE_FILE export and the Jenkinsfile workspace-layout comment - README: document that no license file is needed Verified with a full pipeline rebuild (scope-rebuild12) run while rti_license.dat was absent: 0 warnings, ctest baseline unchanged, all 5 DEBs produced, none of them containing the license.
This commit is contained in:
1 parent
59f0c025e5
commit
11501ff7bb
4 files changed
+9
-29
No files matched your search
@@ -9,7 +9,7 @@ set -euo pipefail
|
||||
# optionally runs the Jenkins builder to produce the release DEB packages.
|
||||
#
|
||||
# - Resolves MIGRATE_PIPELINE_ROOT (exported variable, .envrc, or derived
|
||||
# from the script location) and validates rti_license.dat
|
||||
# from the script location) for the workspace and external mounts
|
||||
# - Uses a prebuilt Docker image with all build dependencies installed
|
||||
# (build it from ./Dockerfile via --build-prebuilt-image)
|
||||
# - Optional deletion of the prebuilt Docker image via --delete-prebuilt-image
|
||||
@@ -60,9 +60,6 @@ MIGRATE_PIPELINE_ROOT resolution (highest precedence first):
|
||||
2. MIGRATE_PIPELINE_ROOT set by .envrc in this directory
|
||||
3. derived from the script location (three levels up)
|
||||
|
||||
Expected file:
|
||||
${MIGRATE_PIPELINE_ROOT}/rti_license.dat
|
||||
|
||||
Examples:
|
||||
./new_docker_build.sh --build-prebuilt-image --docker-image legatus-qt6:1.0
|
||||
./new_docker_build.sh --docker-image legatus-qt6:1.0
|
||||
@@ -383,11 +380,9 @@ fi
|
||||
require_non_empty "${MIGRATE_PIPELINE_ROOT:-}" "MIGRATE_PIPELINE_ROOT"
|
||||
require_directory "${MIGRATE_PIPELINE_ROOT}" "MIGRATE_PIPELINE_ROOT"
|
||||
|
||||
RTI_LICENSE_FILE_HOST="${MIGRATE_PIPELINE_ROOT}/rti_license.dat"
|
||||
WORKSPACE_ROOT_HOST="${MIGRATE_PIPELINE_ROOT}"
|
||||
PROJECT_DIR_HOST="${WORKSPACE_ROOT_HOST}/qt-migration-legatus/qt6-after/qt6-migrated-legatus"
|
||||
|
||||
require_file "${RTI_LICENSE_FILE_HOST}" "RTI license file"
|
||||
require_directory "${PROJECT_DIR_HOST}" "Project directory"
|
||||
|
||||
log_info "RELEASE_BUILD=${RELEASE_BUILD}"
|
||||
@@ -403,7 +398,6 @@ log_info "GUEZ_MODE=${GUEZ_MODE}"
|
||||
log_info "BUILD_NUMBER=${BUILD_NUMBER}"
|
||||
log_info "BUILD_TAG=${BUILD_TAG}"
|
||||
log_info "MIGRATE_PIPELINE_ROOT=${MIGRATE_PIPELINE_ROOT}"
|
||||
log_info "RTI_LICENSE_FILE_HOST=${RTI_LICENSE_FILE_HOST}"
|
||||
log_info "PROJECT_DIR_HOST=${PROJECT_DIR_HOST}"
|
||||
|
||||
if [[ "${BUILD_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
@@ -454,7 +448,6 @@ log_error() {
|
||||
|
||||
log_info "Using prebuilt Docker image: all build dependencies are baked in"
|
||||
|
||||
export RTI_LICENSE_FILE=/workspace/rti_license.dat
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
|
||||
cd /workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
@@ -584,7 +577,6 @@ docker run --rm \
|
||||
-e QT_BASE_DIR \
|
||||
-e RELEASE_BUILD_TARGETS="${RELEASE_BUILD_TARGETS_STRING}" \
|
||||
-v "${WORKSPACE_ROOT_HOST}:/workspace" \
|
||||
-v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
|
||||
-v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \
|
||||
-v "${CONTAINER_SCRIPT_HOST}:/tmp/run-build-inside-container.sh:ro" \
|
||||
-v "${PACKAGE_OUTPUT_DIR}:/workspace/packages-out" \
|
||||
|
||||
Reference in new issue
Block a user