X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-compare-distributions.sh;h=f31f79e387f51ef495101a3933368d3dec36392f;hb=ef0e518dd152a35e717bae341906b7b8e94b34c7;hp=eb2df1c06e9e466483eb180ea91ea6655b15f91f;hpb=6add0a51a819d95dd2462cc2d8ffda2852371250;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh
index eb2df1c06..f31f79e38 100644
--- a/jjb/integration/integration-compare-distributions.sh
+++ b/jjb/integration/integration-compare-distributions.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 
 # Depends on variables created and published from the integration-set-variables script
 
@@ -22,8 +22,9 @@ BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null)
 echo "Bundle version is ${BUNDLE_VERSION}"
 # Acquire the timestamp information from maven-metadata.xml
 NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}"
-wget ${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml
+wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml"
 
+# shellcheck disable=SC2181
 if [ $? -ne 0 ]; then
   echo "unable to find maven-metadata.xml. no need to continue..."
   exit 0
@@ -36,28 +37,39 @@ BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}"
 BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
 ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}"
 
-wget --progress=dot:mega $ACTUAL_BUNDLE_URL
+wget --progress=dot:mega "$ACTUAL_BUNDLE_URL"
 echo "Extracting the last distribution found on nexus..."
-unzip -q $BUNDLE
-mv $BUNDLEFOLDER /tmp/distro_old
-rm $BUNDLE
+unzip -q "$BUNDLE"
+mv "$BUNDLEFOLDER" /tmp/distro_old
+rm "$BUNDLE"
 
 echo "Extracting the distribution just created by this job..."
-NEW_DISTRO="$(find $WORKSPACE -name "${KARAF_ARTIFACT}*.zip")"
+NEW_DISTRO="$(find "$WORKSPACE" -name "${KARAF_ARTIFACT}*.zip")"
 NEW_DISTRO_BASENAME="$(basename "$NEW_DISTRO")"
-cp $NEW_DISTRO /tmp/
+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
+git clone https://git.opendaylight.org/gerrit/integration/test.git
 cd test/tools/distchanges || exit
-mkdir -p $WORKSPACE/archives
+mkdir -p "$WORKSPACE"/archives
 
 # Full output of compare tool will be in temp file /tmp/dist_diff.txt
 # The file/report to be archived will only list the distribution in the comparison and the patches that
 # are different.
-python distcompare.py -r ssh://jenkins-$SILO@git.opendaylight.org:29418 | tee /tmp/dist_diff.txt
-echo -e "Patch differences listed are in comparison to:\n\t$ACTUAL_BUNDLE_URL\n\n" > $WORKSPACE/archives/distribution_differences.txt
-sed -ne '/Patch differences/,$ p' /tmp/dist_diff.txt >> $WORKSPACE/archives/distribution_differences.txt
+python distcompare.py -r "ssh://jenkins-$SILO@git.opendaylight.org:29418" | tee /tmp/dist_diff.txt
+echo -e "Patch differences listed are in comparison to:\n\t$ACTUAL_BUNDLE_URL\n\n" > "$WORKSPACE"/archives/distribution_differences.txt
+sed -ne '/Patch differences/,$ p' /tmp/dist_diff.txt >> "$WORKSPACE"/archives/distribution_differences.txt
+
+# Check OpenDaylight YANG modules:
+echo "Installing pyang"
+pip install --user pyang
+if [ -f /tmp/distro_new/bin/extract_modules.sh ]; then
+    echo "Extracting YANG modules"
+    /tmp/distro_new/bin/extract_modules.sh
+    echo "Checking YANG modules"
+    /tmp/distro_new/bin/check_modules.sh
+    mv /tmp/distro_new/opendaylight-models "$WORKSPACE"/archives
+fi
+