From: Tomas Cere <tomas.cere@pantheon.tech>
Date: Mon, 6 Sep 2021 10:03:28 +0000 (+0200)
Subject: Fix up xpath syntax in mri-stage script
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=3b6584efc5c75a320e0b0fb469e1b01bf62844cc;p=releng%2Fbuilder.git

Fix up xpath syntax in mri-stage script

We are using a different xpath version in our stack
so fixup the syntax so it actually runs.

Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Change-Id: Iff38ac1c5b79ffe761c0c6c099033b2169ce704e
---

diff --git a/jjb/releng-maven-mri-stage.sh b/jjb/releng-maven-mri-stage.sh
index d3920bb2f..9dfb7859e 100644
--- a/jjb/releng-maven-mri-stage.sh
+++ b/jjb/releng-maven-mri-stage.sh
@@ -18,7 +18,7 @@ staging_repo=$(sed -n -e 's/Staging repository \(.*\) created\./\1/p' "$TMP_FILE
 mkdir -p "$WORKSPACE/archives"
 echo "$staging_repo ${NEXUS_URL}/content/repositories/$staging_repo" | tee -a "$WORKSPACE/archives/staging-repo.txt"
 
-staged_version=$(find . -name '*karaf*.pom' -exec xpath -q -e '/project/version/text()' {} +)
+staged_version=$(find . -name '*karaf*.pom' -exec xpath {} '/project/version/text()' \; 2> /dev/null)
 BUNDLE_URL="${NEXUS_URL}/content/repositories/$staging_repo/org/opendaylight/${PROJECT}/${KARAF_ARTIFACT}/${staged_version}/${KARAF_ARTIFACT}-${staged_version}.zip"
 
 # Cleanup