setup: do not set ceph_qa_suite_git_url in ~/.teuthology.yaml

When this value is set, it is necessary to explicitly give --suite-repo and
--suite-branch. We would rather have the defaults for these come from
--ceph-repo and --ceph.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 6d8c68d906bd3c4c79fd77a03b0746b294c61b01..ad89a6fced381988d3ec2e3848b905676951967b 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -644,14 +644,13 @@ class TeuthologyOpenStack(OpenStack):
         if self.args.upload:
             argv.extend(['--archive-upload', self.args.archive_upload,
                          '--archive-upload-url', self.args.archive_upload_url])
-        for (arg, opt) in (('ceph_repo', 'ceph_git_url'),
-                           ('suite_repo', 'ceph_qa_suite_git_url')):
-            if getattr(self.args, arg):
-                command = (
-                    "perl -pi -e 's|.*{opt}.*|{opt}: {value}|'"
-                    " ~/.teuthology.yaml"
-                ).format(opt=opt, value=getattr(self.args, arg))
-                self.ssh(command)
+        ceph_repo = getattr(self.args, 'ceph_repo')
+        if ceph_repo:
+            command = (
+                "perl -pi -e 's|.*{opt}.*|{opt}: {value}|'"
+                " ~/.teuthology.yaml"
+            ).format(opt='ceph_git_url', value=ceph_repo)
+            self.ssh(command)
         argv.append('/home/' + self.username +
                     '/teuthology/teuthology/openstack/openstack.yaml')
         command = (

diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh
index 05243b7394e855ee8d75bdd464fc6b59f6acd5c5..05afbb11d252b4da21de7ecdc811b194be8d1bfa 100755 (executable)
--- a/teuthology/openstack/setup-openstack.sh
+++ b/teuthology/openstack/setup-openstack.sh
@@ -56,7 +56,6 @@ results_server: http://localhost:8080/
 gitbuilder_host: gitbuilder.ceph.com
 check_package_signatures: false
 ceph_git_url: https://github.com/ceph/ceph.git
-ceph_qa_suite_git_url: https://github.com/ceph/ceph-qa-suite.git
 queue_port: 11300
 suite_verify_ceph_hash: false
 queue_host: localhost