Terminate Tower instances after CI ends. (ansible#37265)

* Remove obsolete Tower support from manage_ci. * Add missing remote settings to cloud tests.
bcoca · Mar 10, 2018 · 11ad559 · 11ad559
1 parent 8980d27
commit 11ad559
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/test/runner/lib/manage_ci.py b/test/runner/lib/manage_ci.py
@@ -135,8 +135,6 @@ def __init__(self, core_ci):
             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
@@ -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/"