From 7a9bc80fb54dae508fcb123370b0c30ba841e236 Mon Sep 17 00:00:00 2001 From: gkyratsas Date: Wed, 24 Apr 2019 16:37:43 +0200 Subject: [PATCH] openstack: always pass branch and repo parameters We need to always pass the parameters below in order to make it work using environment variables: --ceph --ceph-repo --suite-repo --suite-branch --teuthology-branch Signed-off-by: gkyratsas Conflicts: teuthology/openstack/__init__.py --- teuthology/openstack/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index 1f2d598f7..1f006dedc 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -714,12 +714,20 @@ class TeuthologyOpenStack(OpenStack): running the teuthology cluster. """ original_argv = self.argv[:] - argv = [] + argv = ['--ceph', self.args.ceph, + '--ceph-repo', self.args.ceph_repo, + '--suite-repo', self.args.suite_repo, + '--suite-branch', self.args.suite_branch, + ] while len(original_argv) > 0: if original_argv[0] in ('--name', '--teuthology-branch', '--teuthology-git-url', '--test-repo', + '--suite-repo', + '--suite-branch', + '--ceph-repo', + '--ceph', '--archive-upload', '--archive-upload-url', '--key-name', -- 2.47.3