From: rakeshgm Date: Wed, 8 May 2019 08:06:25 +0000 (+0530) Subject: branch info taken from config, defaults to master X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7485e9a333a0ef56ed228285e0e548f40bb52864;p=ceph.git branch info taken from config, defaults to master Signed-off-by: rakeshgm --- diff --git a/qa/tasks/nfs_ganesha_rgw_v2.py b/qa/tasks/nfs_ganesha_rgw_v2.py index c5e62e5b3fecb..0b613c7eb4840 100644 --- a/qa/tasks/nfs_ganesha_rgw_v2.py +++ b/qa/tasks/nfs_ganesha_rgw_v2.py @@ -40,6 +40,7 @@ def task(ctx, config): script_name = tests_mapper.get(config['test-name'], None) + ".py" nfs_version = config['nfs-version'] mount_dir = config['mount-dir'] + branch = config.get("branch", "master") log.info('got test_name: %s' % test_name) log.info('got nfs version: %s' % nfs_version) @@ -101,7 +102,7 @@ def task(ctx, config): rgw[0].run(args=['cd', 'nfs-ganesha-rgw', run.Raw(';'), 'git', 'clone', 'https://github.com/red-hat-storage/ceph-qe-scripts.git']) - rgw[0].run(args=['cd', 'nfs-ganesha-rgw/ceph-qe-scripts', run.Raw(';'), 'git', 'checkout', 'wip-nfs-ganesha-rgw-v2']) + rgw[0].run(args=['cd', 'nfs-ganesha-rgw/ceph-qe-scripts', run.Raw(';'), 'git', 'checkout', '%s' % branch]) rgw[0].run(args=['virtualenv', 'venv'])