From efe0799abff3ed1530e99da93ab7f7a601b03ca1 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Thu, 10 Oct 2019 19:21:26 -0700 Subject: [PATCH] Add YANG module check in distribution merge job See INTDIST-107 Change-Id: I3f12cc31d90df3ef48d30b5b2bf2da2673b98c26 Signed-off-by: Luis Gomez --- .../integration-compare-distributions.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh index 6e48b2d23..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 @@ -61,3 +61,15 @@ mkdir -p "$WORKSPACE"/archives 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 + -- 2.36.6