Merge "Skip SFT during mdsal-sonar"

[releng/builder.git] / jjb / integration / integration-compare-distributions.sh

diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh
index b02b568027b806c7e372df4c23c3621ca2b3a981..87ad52100927df5cef44ad2c5e9b2f6e0283d0eb 100644 (file)
--- a/jjb/integration/integration-compare-distributions.sh
+++ b/jjb/integration/integration-compare-distributions.sh
@@ -11,7 +11,12 @@ GERRIT_PATH=${GERRIT_PATH:-git.opendaylight.org/gerrit}
 DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH}
 
 # Obtain current pom.xml of integration/distribution, correct branch.
-wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+if [[ "$KARAF_ARTIFACT" == "opendaylight" ]]; then
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=opendaylight/pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+else
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
+fi
+
 # Extract the BUNDLE_VERSION from the pom.xml
 BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
 echo "Bundle version is ${BUNDLE_VERSION}"
@@ -42,9 +47,8 @@ NEW_DISTRO="$(find $WORKSPACE -name "${KARAF_ARTIFACT}*.zip")"
 NEW_DISTRO_BASENAME="$(basename "$NEW_DISTRO")"
 cp $NEW_DISTRO /tmp/
 cd /tmp/ || exit
-# get the name of the folder which will be extracted to
-EXTRACTED_FOLDER=$(unzip $NEW_DISTRO_BASENAME | grep 'creating:' | grep -v '/.' | cut -d' ' -f5-)
-mv $EXTRACTED_FOLDER distro_new
+unzip $NEW_DISTRO_BASENAME
+mv $BUNDLEFOLDER distro_new
 
 git clone https://git.opendaylight.org/gerrit/p/integration/test.git
 cd test/tools/distchanges || exit