[ARVADOS-DEV] updated: ba477f5a117087f80d7e7679da45937e5425654a

[Git user]

Summary of changes:
 jenkins/run-delete-merged-branches.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

       via  ba477f5a117087f80d7e7679da45937e5425654a (commit)
      from  e4bcdc4ace33d30c7d672d5e508c544db8c8c582 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ba477f5a117087f80d7e7679da45937e5425654a
Author: Nico Cesar <nico at curoverse.com>
Date:   Tue Jan 9 13:28:04 2018 -0500

    11020: deploying https://ci.curoverse.com/job/pipeline-cleanup
    
    refs #11020
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <ncesar at veritasgenetics.com>

diff --git a/jenkins/run-delete-merged-branches.sh b/jenkins/run-delete-merged-branches.sh
index 175b144..627cb40 100755
--- a/jenkins/run-delete-merged-branches.sh
+++ b/jenkins/run-delete-merged-branches.sh
@@ -20,13 +20,13 @@ trap '_exit_handler $LINENO' EXIT ERR
 # List here branches that you don't want to ever delete, separated with "|"
 # (as they will be passed as a parameter to egrep)
 # IE: "keep_this_branch|also_this_other|and_this_one"
-branches_to_keep="master"
+branches_to_keep="master|integration|dev|staging"
 
 git remote update --prune
 git checkout master
 
 git branch --remote --merged | \
-    egrep -v ${branches_to_keep} | \
+    egrep -v "/(${branches_to_keep})\$" | \
     sed 's/origin\///' | \
-    xargs -n 1 git push --delete origin
+    xargs --no-run-if-empty -n 1 git push --delete origin
 

-----------------------------------------------------------------------


hooks/post-receive
--