Merge branch 'release/0.7.4'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### citustools v0.7.4 (November 15, 2017) ###
+
+* Switches nightly logic to detect Debian Stretch
+
+* Improvements to valgrind logic
+
 ### citustools v0.7.3 (October 5, 2017) ###
 
 * Fixes regex problem with PG 10 RPM builds

HomebrewFormula/citustools.rb

@@ -12,8 +12,8 @@ def message
 class Citustools < Formula
   desc "Tools and config used in Citus Data projects."
   homepage "https://github.com/citusdata/tools"
-  url "https://github.com/citusdata/tools/archive/v0.7.2.tar.gz"
-  sha256 "bbb0545ce95ad4de66036daa55e60bf52ab8b64786d62df978a8ad585b0c7010"
+  url "https://github.com/citusdata/tools/archive/v0.7.3.tar.gz"
+  sha256 "664a388d7bfb07c86d9de935823642795ca125912dd970891e36fad8befeb60e"
 
   depends_on "uncrustify"
   depends_on Docker

travis/README.md

@@ -78,5 +78,5 @@ Pairs with `build_new_nightly` to trigger a new Docker Hub nightly image build.
 
   * Project is `citus`
   * OS is `debian`
-  * Release is `jessie`
+  * Release is `stretch`
   * New nightly was produced

travis/trigger_docker_nightly

@@ -8,8 +8,8 @@ IFS=$'\n\t'
 success=0
 failure=1
 
-if [ "${TARGET_PLATFORM}" != "debian/jessie" ]; then
-    echo "not Debian Jessie, skipping Docker trigger..." >&2
+if [ "${TARGET_PLATFORM}" != "debian/stretch" ]; then
+    echo "not Debian Stretch, skipping Docker trigger..." >&2
     exit $success
 elif [ ! -e "pkgs/nightlies" ]; then
     echo "no new nightlies, skipping Docker trigger..." >&2

valgrind/run-valgrind-tests

@@ -13,7 +13,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install -yq \
     bison \
     libssl-dev \
     valgrind \
-    mailutils
+    mailutils \
+    libcurl4-openssl-dev
 
 # set environment variables
 export LC_ALL=en_US.UTF-8
@@ -49,11 +50,19 @@ sudo chown ubuntu /usr/local/pgsql/bin/ -R
 cd src/test/regress
 make check-multi-vg VALGRIND_LOG_FILE=logs.txt || true
 
-# surprisingly this hits inbox
+attachments=""
 if [ -s logs.txt ]; then
-	mail -aFrom:valgrind-test@citusdata.com -s "[Valgrind Test Results] - Failure" -A logs.txt burak@citusdata.com metin@citusdata.com < /dev/null
+    attachments=$attachments" -A logs.txt"
+fi
+
+if [ -s regression.diffs ]; then
+    attachments=$attachments" -A regression.diffs"
+fi
+
+if [ -z "$attachments" ]; then
+    mail -aFrom:valgrind-test@citusdata.com -s "[Valgrind Test Results] - Success" burak@citusdata.com metin@citusdata.com < /dev/null
 else
-	mail -aFrom:valgrind-test@citusdata.com -s "[Valgrind Test Results] - Success" burak@citusdata.com metin@citusdata.com < /dev/null
+    mail -aFrom:valgrind-test@citusdata.com -s "[Valgrind Test Results] - Failure" $attachments burak@citusdata.com metin@citusdata.com < /dev/null
 fi
 
 # just to ensure everything is completed in the test instance