From c0a078c53bb643bea06efa62a9f70f28e8e63841 Mon Sep 17 00:00:00 2001 From: Burak Yucesoy Date: Mon, 11 Sep 2017 16:49:29 -0700 Subject: [PATCH 1/6] Send regression test's output with valgrind result mail --- valgrind/download-test-scripts | 1 + valgrind/run-valgrind-tests | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/valgrind/download-test-scripts b/valgrind/download-test-scripts index 38cb6543..fcfd1a6e 100755 --- a/valgrind/download-test-scripts +++ b/valgrind/download-test-scripts @@ -13,4 +13,5 @@ apt-get install git make -y # download the test scripts git clone https://github.com/citusdata/tools.git cd tools +git checkout send_regression_output make install diff --git a/valgrind/run-valgrind-tests b/valgrind/run-valgrind-tests index b8b1fb43..f772b15f 100755 --- a/valgrind/run-valgrind-tests +++ b/valgrind/run-valgrind-tests @@ -49,11 +49,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 From feb77ff0dddb87ea8e196de70bd92ae3cdf17fcb Mon Sep 17 00:00:00 2001 From: metdos Date: Wed, 1 Nov 2017 18:59:54 +0200 Subject: [PATCH 2/6] Add libcurl to valgrind test dependencies --- valgrind/run-valgrind-tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/valgrind/run-valgrind-tests b/valgrind/run-valgrind-tests index b8b1fb43..03f68883 100755 --- a/valgrind/run-valgrind-tests +++ b/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 From 5ab9448641353e02f4245b57af91e0884c7abca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Burak=20Y=C3=BCcesoy?= Date: Tue, 7 Nov 2017 23:11:28 -0900 Subject: [PATCH 3/6] Use default branch in valgrind tests --- valgrind/download-test-scripts | 1 - 1 file changed, 1 deletion(-) diff --git a/valgrind/download-test-scripts b/valgrind/download-test-scripts index fcfd1a6e..38cb6543 100755 --- a/valgrind/download-test-scripts +++ b/valgrind/download-test-scripts @@ -13,5 +13,4 @@ apt-get install git make -y # download the test scripts git clone https://github.com/citusdata/tools.git cd tools -git checkout send_regression_output make install From afc5feba97ca1fc3d05139cd4bbf780ca6f10efe Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Tue, 14 Nov 2017 10:53:06 -0800 Subject: [PATCH 4/6] Bump citus tools version --- HomebrewFormula/citustools.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HomebrewFormula/citustools.rb b/HomebrewFormula/citustools.rb index 844e3349..6abb5474 100644 --- a/HomebrewFormula/citustools.rb +++ b/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 From 64f7959ab6dfe5ea239b16367e786e102eedc1a9 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Wed, 15 Nov 2017 15:02:14 -0800 Subject: [PATCH 5/6] Switch nightly logic to detect Debian Stretch The PostgreSQL 10 Docker images are based on Debian Stretch now, so that's what we should detect when triggering a nightly image. --- travis/README.md | 2 +- travis/trigger_docker_nightly | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/travis/README.md b/travis/README.md index e9bf68ac..beb0c203 100644 --- a/travis/README.md +++ b/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 diff --git a/travis/trigger_docker_nightly b/travis/trigger_docker_nightly index 5d78ba58..2732762c 100755 --- a/travis/trigger_docker_nightly +++ b/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 From eb53e138d1b40948c9f140497507c80b7f62fc06 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Wed, 15 Nov 2017 15:05:56 -0800 Subject: [PATCH 6/6] Bump changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a31b13d9..3ada5506 100644 --- a/CHANGELOG.md +++ b/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