From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 29 Jan 2016 16:58:41 +0000 (+0000)
Subject: Merge "removing vtn-all jobs from distribution-test list"
X-Git-Tag: release/beryllium~61
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8988fd74613aaed566135a0c810baade0d5f6aa2;hp=59c4af4d0e26c3d74f74a72e19d4eb5c35e5adf8;p=releng%2Fbuilder.git

Merge "removing vtn-all jobs from distribution-test list"
---

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index d7b57d004..2066e3e2b 100644
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -108,5 +108,16 @@ cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-# vim: ts=4 sw=4 sts=4 et ft=sh :
+echo "Detecting misplaced config files"
+pushd "${WORKSPACE}/${BUNDLEFOLDER}"
+XMLS_FOUND=`echo *.xml`
+popd
+if [ "$XMLS_FOUND" != "*.xml" ]; then
+    echo "Bug 4628 confirmed."
+    ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
+    # exit 1
+else
+    echo "Bug 4628 not detected."
+fi
 
+# vim: ts=4 sw=4 sts=4 et ft=sh :