From 9139c8292c97237798fc4bed796444361a9efa19 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 10 Feb 2017 15:38:06 +0100 Subject: [PATCH] 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 --- teuthology/openstack/__init__.py | 15 +++++++-------- teuthology/openstack/setup-openstack.sh | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index 6d8c68d906..ad89a6fced 100644 --- 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 05243b7394..05afbb11d2 100755 --- 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 -- 2.39.5