Prevent printing remote md5 sum

If the remote file is a binary or other junk, we don't want to
print it to the console, so just state it's not a match for now.

Add puppet logging hack to help debug CI

Change-Id: Ia4717ee0cf7a2fc01299d0819c49218487ffdf15
Signed-off-by: Michael Chapman <michapma@redhat.com>

diff --git a/build/cache.sh b/build/cache.sh
index 123748a..4d41a7a 100644 (file)
--- a/build/cache.sh
+++ b/build/cache.sh
@@ -60,7 +60,7 @@ function populate_cache {
         else
             my_md5=$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'})
             if [ "$remote_md5" != "$my_md5" ]; then
-                echo "MD5 mismatch: Remote MD5 is ${remote_md5}, Cache file MD5 is ${my_md5}"
+                echo "MD5 mismatch, cache file MD5 is ${my_md5}"
                 echo "Downloading $filename"
                 curl_file $1 $filename
             else

diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 73709a2..01f4026 100755 (executable)
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -83,6 +83,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload puppet-congress.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
     --run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
+    --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
     -a overcloud-full_build.qcow2
 
 mv -f overcloud-full_build.qcow2 overcloud-full.qcow2