From 11ad5590109f2f91da8b6830d38237e994549660 Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Fri, 9 Mar 2018 16:17:29 -0800
Subject: [PATCH] Terminate Tower instances after CI ends. (#37265)

* Remove obsolete Tower support from manage_ci.
* Add missing remote settings to cloud tests.
---
 test/runner/lib/manage_ci.py  | 2 --
 test/utils/shippable/cloud.sh | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/runner/lib/manage_ci.py b/test/runner/lib/manage_ci.py
index defea7f1e37..b66ec97d9a3 100644
--- a/test/runner/lib/manage_ci.py
+++ b/test/runner/lib/manage_ci.py
@@ -135,8 +135,6 @@ class ManagePosixCI(object):
             self.become = ['sudo', '-in', 'PATH=/usr/local/bin:$PATH']
         elif self.core_ci.platform == 'rhel':
             self.become = ['sudo', '-in', 'bash', '-c']
-        elif self.core_ci.platform == 'tower':
-            self.become = ['sudo', '-in', 'bash', '-c']
 
     def setup(self):
         """Start instance and wait for it to become ready and respond to an ansible ping."""
diff --git a/test/utils/shippable/cloud.sh b/test/utils/shippable/cloud.sh
index 83e02920e54..47689c2b7ea 100755
--- a/test/utils/shippable/cloud.sh
+++ b/test/utils/shippable/cloud.sh
@@ -9,6 +9,9 @@ image="${args[1]}"
 python="${args[2]}"
 target="posix/ci/cloud/group${args[3]}/"
 
+stage="${S:-prod}"
+
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
+    --remote-terminate always --remote-stage "${stage}" \
     --docker "${image}" --python "${python}" --changed-all-target "${target}smoketest/"