From 3acaecca8b74e5ee66d3f2eff35fddf1e794df30 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 4 Sep 2016 20:07:35 +0100 Subject: [PATCH] test-bot: use UPSTREAM_BOTTLE_KEEP_OLD. This is set by Jenkins to indicate a downstream bottle upload job needs to use `brew bottle --keep-old`. --- Library/Homebrew/dev-cmd/test-bot.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb index 8474e1f88c..4295639d22 100644 --- a/Library/Homebrew/dev-cmd/test-bot.rb +++ b/Library/Homebrew/dev-cmd/test-bot.rb @@ -857,7 +857,11 @@ module Homebrew safe_system "brew", "pull", "--clean", pull_pr end - system "brew", "bottle", "--merge", "--write", *json_files + if ENV["UPSTREAM_BOTTLE_KEEP_OLD"] + system "brew", "bottle", "--merge", "--write", "--keep-old", *json_files + else + system "brew", "bottle", "--merge", "--write", *json_files + end remote = "git@github.com:BrewTestBot/homebrew-#{tap.repo}.git" git_tag = pr ? "pr-#{pr}" : "testing-#{number}"