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,27 +1,30 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Local release pipeline for the Qt6-migrated legatus validation scope
|
||||
# (TetraIF, Z, Lts/Common + Lts/Proxies/TrainingAreaBase).
|
||||
# Local release pipeline for the Qt6-migrated legatus Release 2 scope
|
||||
# (AP3, AP4, AP9, TetraIF, tests - 46 targets).
|
||||
#
|
||||
# Runs the in-tree new_docker_build.sh:
|
||||
# - builds the prebuilt Docker image from the in-tree Dockerfile when the
|
||||
# image is not present yet
|
||||
# Runs the in-tree new_docker_build_release2.sh:
|
||||
# - uses the prebuilt Docker image when present; otherwise the driver
|
||||
# installs the dependencies in-container from the base image (slower)
|
||||
# - builds the release scope, runs ctest and produces the release DEB
|
||||
# packages with the in-tree rpmbuild script
|
||||
# - collects the lcov code-coverage report (--run-coverage; set
|
||||
# DRYRUN_COVERAGE=OFF to skip)
|
||||
#
|
||||
# The DEB packages land in ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/
|
||||
# (Jenkins-style layout; locally WORKSPACE is the pipeline root).
|
||||
# The DEB packages land in ${MIGRATE_PIPELINE_ROOT}/rpms/${PROJECT}/${OS_VERSION}/
|
||||
# (Jenkins-style layout; locally the pipeline root is the directory that
|
||||
# contains qt-migration-legatus/).
|
||||
#
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
LEGATUS_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
||||
PIPELINE_ROOT="${LEGATUS_ROOT}"
|
||||
# Tree layout: <pipeline root>/qt-migration-legatus/qt6-after/qt6-migrated-legatus
|
||||
PIPELINE_ROOT="$(cd "${LEGATUS_ROOT}/../../.." && pwd)"
|
||||
|
||||
# Release build configuration (Jenkins-style variables)
|
||||
export WORKSPACE="${PIPELINE_ROOT}"
|
||||
export MIGRATE_PIPELINE_ROOT="${MIGRATE_PIPELINE_ROOT:-${PIPELINE_ROOT}}"
|
||||
export PROJECT="${PROJECT:-guez}"
|
||||
export OS_VERSION="${OS_VERSION:-26.04}"
|
||||
export LTS_VERSION="${LTS_VERSION:-1.0}"
|
||||
@@ -45,15 +48,19 @@ log_info "Package output: ${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/"
|
||||
|
||||
cd "${LEGATUS_ROOT}"
|
||||
|
||||
# Build the prebuilt image from the in-tree Dockerfile when not present yet
|
||||
# (--build-prebuilt-image builds the image and exits)
|
||||
if ! docker image inspect "${DOCKER_IMAGE}" >/dev/null 2>&1; then
|
||||
log_info "Prebuilt image not found - building it from the in-tree Dockerfile..."
|
||||
bash ./new_docker_build.sh --build-prebuilt-image --docker-image "${DOCKER_IMAGE}"
|
||||
# Use the prebuilt image when present; otherwise let the driver install the
|
||||
# dependencies in-container from the base image (slower, no image build).
|
||||
PREBUILT_FLAG=()
|
||||
if docker image inspect "${DOCKER_IMAGE}" >/dev/null 2>&1; then
|
||||
PREBUILT_FLAG=(--use-prebuilt-image)
|
||||
log_info "Using prebuilt image ${DOCKER_IMAGE}"
|
||||
else
|
||||
log_info "Prebuilt image ${DOCKER_IMAGE} not found - the driver will install dependencies in-container"
|
||||
fi
|
||||
|
||||
# Release scope build + ctest + DEB production (in-tree rpmbuild)
|
||||
bash ./new_docker_build.sh \
|
||||
bash ./new_docker_build_release2.sh \
|
||||
"${PREBUILT_FLAG[@]}" \
|
||||
--docker-image "${DOCKER_IMAGE}" \
|
||||
--run-jenkins-builder \
|
||||
--package-output-dir "${WORKSPACE}/rpms/${PROJECT}/${OS_VERSION}/" \
|
||||
@@ -66,7 +73,8 @@ bash ./new_docker_build.sh \
|
||||
# DRYRUN_COVERAGE=OFF for a fast local DEB-only run.
|
||||
DRYRUN_COVERAGE="${DRYRUN_COVERAGE:-ON}"
|
||||
if [[ "${DRYRUN_COVERAGE}" == "ON" ]]; then
|
||||
bash ./new_docker_build.sh \
|
||||
bash ./new_docker_build_release2.sh \
|
||||
"${PREBUILT_FLAG[@]}" \
|
||||
--docker-image "${DOCKER_IMAGE}" \
|
||||
--run-coverage \
|
||||
--coverage-output-dir "${WORKSPACE}/coverage/${PROJECT}/${OS_VERSION}"
|
||||
|
||||
Reference in new issue
Block a user