Merge pull request #35980 - chore: configure and use LOCAL_RPM_REPO for RPM artifacts

chore: configure and use LOCAL_RPM_REPO for RPM artifacts

Author: esolitos

.buildkite/Makefile

@@ -19,6 +19,8 @@ export LOCAL_MVN_REPO ?= $(WORKDIR)/artifacts/$(ARCH)/maven-repo
 export VESPA_MAVEN_EXTRA_OPTS ?= --show-version --batch-mode --no-snapshot-updates  \
 	-DaltDeploymentRepository=local-repo::default::file:$(LOCAL_MVN_REPO)
 
+export LOCAL_RPM_REPO ?= $(WORKDIR)/artifacts/$(ARCH)/rpms
+
 export NUM_CPU_LIMIT ?= $(shell nproc)
 export NUM_CPP_THREADS := $(shell echo $$(( $(NUM_CPU_LIMIT)*2/3 )))
 export NUM_MVN_THREADS := $(shell echo $$(( $(NUM_CPU_LIMIT)*2/3 )))

.buildkite/basic-search-test.sh

@@ -12,8 +12,11 @@ if [[ -n "${DEBUG:-}" ]]; then
     set -o xtrace
 fi
 
+: "${VESPA_VERSION:?Environment variable VESPA_VERSION must be set (version to build)}"
+: "${LOCAL_RPM_REPO:?Environment variable LOCAL_RPM_REPO must be set (path to local RPM repo)}"
+
 echo "--- 🔧 Setting up Vespa RPM repository"
-echo -e "[vespa-rpms-local]\nname=Local Vespa RPMs\nbaseurl=file://$(pwd)/artifacts/$ARCH/rpms\nenabled=1\ngpgcheck=0" > /etc/yum.repos.d/vespa-rpms-local.repo
+echo -e "[vespa-rpms-local]\nname=Local Vespa RPMs\nbaseurl=file://${LOCAL_RPM_REPO}\nenabled=1\ngpgcheck=0" > /etc/yum.repos.d/vespa-rpms-local.repo
 
 echo "Installing Vespa $VESPA_VERSION..."
 if ! rpm -q "vespa-$VESPA_VERSION"; then

.buildkite/build-container.sh

@@ -40,8 +40,10 @@ else
 fi
 
 echo "Preparing RPMs for container build..."
-rm -rf "${WORKDIR}/docker-image/rpms"
-cp -a "${WORKDIR}/artifacts/$ARCH/rpms" "${WORKDIR}/docker-image/"
+# Ensure clean state for rpms directory
+rm -rf "${WORKDIR}/docker-image/rpms" && mkdir -p "${WORKDIR}/docker-image/rpms"
+# Note: Appending "./" ensures that the directory's contents are copied, rather than the directory itself.
+cp -a "${LOCAL_RPM_REPO}/." "${WORKDIR}/docker-image/rpms/"
 
 cd "${WORKDIR}/docker-image"
 SOURCE_GITREF=$(git rev-parse HEAD)

.buildkite/build-rpms.sh

@@ -12,6 +12,9 @@ if [[ -n "${DEBUG:-}" ]]; then
     set -o xtrace
 fi
 
+: "${VESPA_VERSION:?Environment variable VESPA_VERSION must be set (version to build)}"
+: "${LOCAL_RPM_REPO:?Environment variable LOCAL_RPM_REPO must be set (path to local RPM repo)}"
+
 echo "--- 📦 Building RPM packages"
 ulimit -c 0
 
@@ -26,5 +29,5 @@ rpmbuild --rebuild \
   --define "installdir $WORKDIR/vespa-install" "$WORKDIR"/vespa-"$VESPA_VERSION"-*.src.rpm
 
 echo "Moving RPMs and creating repository..."
-mv "$WORKDIR"/vespa-rpmbuild/RPMS/*/*.rpm "$WORKDIR/artifacts/$ARCH/rpms"
-createrepo "$WORKDIR/artifacts/$ARCH/rpms"
+mv "$WORKDIR"/vespa-rpmbuild/RPMS/*/*.rpm "$LOCAL_RPM_REPO"
+createrepo "$LOCAL_RPM_REPO"

.buildkite/prepare.sh

@@ -12,10 +12,15 @@ if [[ -n "${DEBUG:-}" ]]; then
     set -o xtrace
 fi
 
+: "${VESPA_VERSION:?Environment variable VESPA_VERSION must be set (version to build)}"
+: "${SOURCE_DIR:?Environment variable SOURCE_DIR must be set (path to source code)}"
+: "${LOCAL_RPM_REPO:?Environment variable LOCAL_RPM_REPO must be set (path to local RPM repo)}"
+: "${LOCAL_MVN_REPO:?Environment variable LOCAL_MVN_REPO must be set (path to local Maven repo)}"
+
 echo "--- 🛠️ Preparing build environment"
 echo "Updating Vespa version in POMs to $VESPA_VERSION..."
 "$SOURCE_DIR/.buildkite/replace-vespa-version-in-poms.sh" "$VESPA_VERSION" "$SOURCE_DIR"
 
 echo "Creating artifact directories..."
-mkdir -p "$WORKDIR/artifacts/$ARCH/rpms"
-mkdir -p "$WORKDIR/artifacts/$ARCH/maven-repo"
+mkdir -p "$LOCAL_RPM_REPO"
+mkdir -p "$LOCAL_MVN_REPO"

.buildkite/publish-artifacts.sh

@@ -12,14 +12,22 @@ if [[ -n "${DEBUG:-}" ]]; then
     set -o xtrace
 fi
 
+: "${VESPA_VERSION:?Environment variable VESPA_VERSION must be set (version to build)}"
+: "${LOCAL_RPM_REPO:?Environment variable LOCAL_RPM_REPO must be set (path to local RPM repo)}"
+: "${LOCAL_MVN_REPO:?Environment variable LOCAL_MVN_REPO must be set (path to local Maven repo)}"
+
 echo "--- 📤 Publishing build artifacts"
 cd "$WORKDIR/artifacts/$ARCH"
 
 echo "Creating archives..."
-tar -cf rpm-repo.tar rpms &
-tar -cf maven-repo.tar maven-repo
-cp -a rpms/vespa-config-model-fat-*.rpm .
-wait
+tar -C "$(dirname "$LOCAL_MVN_REPO")" -cf maven-repo.tar "$(basename "$LOCAL_MVN_REPO")" &
+maven_tar_pid=$!
+tar -C "$(dirname "$LOCAL_RPM_REPO")" -cf rpm-repo.tar "$(basename "$LOCAL_RPM_REPO")" &
+rpm_tar_pid=$!
+wait "$maven_tar_pid"
+wait "$rpm_tar_pid"
+
+cp -a "${LOCAL_RPM_REPO}"/vespa-config-model-fat-*.rpm .
 
 echo "Signing artifacts..."
 for FILE in *.tar *.rpm; do