X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-maven-mri-stage.sh;h=3b5ddd56d08ae141bf90e65e08b8d24e4919e28a;hb=c12a67cc59fe8e3c2e39bdbc0bad57fbdadf5e4f;hp=9dd7b4e6cd17bebeca085934f3b2bba9df7d71e3;hpb=eb924e7574b982a783c2b3d54ba66cc28d554524;p=releng%2Fbuilder.git diff --git a/jjb/releng-maven-mri-stage.sh b/jjb/releng-maven-mri-stage.sh index 9dd7b4e6c..3b5ddd56d 100644 --- a/jjb/releng-maven-mri-stage.sh +++ b/jjb/releng-maven-mri-stage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "---> releng-maven-mri-stage.sh" # This script publishes artifacts to a staging repo in Nexus and exports the karaf bundle URL. @@ -18,7 +18,9 @@ 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 {} '/project/version/text()' \; 2> /dev/null) +# TODO: remove the second xpath command once the old version in CentOS 7 is not used any more +staged_version=$(find . -name '*karaf*.pom' -exec \ + sh -c 'xpath -e "/project/version/text()" "$1" 2>/dev/null || xpath "$1" "/project/version/text()" 2>/dev/null' xpath.sh {} \;) BUNDLE_URL="${NEXUS_URL}/content/repositories/$staging_repo/org/opendaylight/${PROJECT}/${KARAF_ARTIFACT}/${staged_version}/${KARAF_ARTIFACT}-${staged_version}.zip" # Cleanup @@ -29,4 +31,5 @@ echo "Bundle url is ${BUNDLE_URL}" # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus cat > "${WORKSPACE}/maven-staged-bundle.env" <