Remove hardcoded baserock build test support from generic code.

1 files changed, 4 insertions, 30 deletions

diff --git a/scripts/release-test-os b/scripts/release-test-os
index 31da0bba..794f8349 100755
--- a/scripts/release-test-os
+++ b/scripts/release-test-os
@@ -392,27 +392,12 @@ class ReleaseApp(cliapp.Application):
                                   'ARCH:HOST:PATH that VMs can be deployed to',
                                   default=None,
                                   group=group_main)
-        self.settings.string(['trove-host'],
-                             'Address of Trove for test systems to build from',
-                             default=None,
-                             group=group_main)
-        self.settings.string(['trove-id'],
-                             'ID of Trove for test systems to build from',
-                             default=None,
-                             group=group_main)
-        self.settings.string(['build-ref-prefix'],
-                             'Prefix of build branches for test systems',
-                             default=None,
-                             group=group_main)
         self.settings.string(['net-id'],
                              'Openstack network ID',
                              default=None,
                              group=group_main)
 
-    @staticmethod
-    def _run_tests(instance, system_path, system_morph,
-                   (trove_host, trove_id, build_ref_prefix),
-                   morph_helper, systems):
+    def run_tests(self, instance):
         instance.wait_until_online()
 
         tests = []
@@ -434,8 +419,7 @@ class ReleaseApp(cliapp.Application):
             test(instance)
 
     def deploy_and_test_systems(self, cluster_path,
-                                deployment_hosts, build_test_config,
-                                net_id):
+                                deployment_hosts, net_id):
         """Run the deployments and tests"""
 
         version = 'release-test'
@@ -462,18 +446,13 @@ class ReleaseApp(cliapp.Application):
 
             instance = deployment.deploy()
             try:
-                self._run_tests(instance, system_path, system_morph,
-                                build_test_config, morph_helper, systems)
+                self.run_tests(instance)
             finally:
                 instance.delete()
 
     def process_args(self, args):
         """Process the command line args and kick off the builds/tests"""
-        if self.settings['build-ref-prefix'] is None:
-            self.settings['build-ref-prefix'] = (
-                os.path.join(self.settings['trove-id'], 'builds'))
-        for setting in ('deployment-host', 'trove-host',
-                        'trove-id', 'build-ref-prefix', 'net-id'):
+        for setting in ('deployment-host', 'net-id'):
             self.settings.require(setting)
 
         deployment_hosts = {}
@@ -486,15 +465,10 @@ class ReleaseApp(cliapp.Application):
             # TODO: Don't assume root is the user with deploy access
             deployment_hosts[arch] = VMHost(user, address, disk_path)
 
-        build_test_config = (self.settings['trove-host'],
-                             self.settings['trove-id'],
-                             self.settings['build-ref-prefix'])
-
         if len(args) != 1:
             raise cliapp.AppException('Usage: release-test CLUSTER')
         cluster_path = morphlib.util.sanitise_morphology_path(args[0])
         self.deploy_and_test_systems(cluster_path, deployment_hosts,
-                                     build_test_config,
                                      self.settings['net-id'])