From 4f1407fa98a877aefe3e4a6f9fe0572a4c443ac6 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 22 Oct 2018 10:44:40 -0400 Subject: [PATCH] qa/tasks/qemu: use unique clone directory to avoid race with workunit If there is a workunit task associated with the same client, the two tasks will attempt to clone the suite repo to the same directory. Worse, if it's parallel tasks, the two clones will clobber each other. Fixes: http://tracker.ceph.com/issues/36542 Signed-off-by: Jason Dillaman (cherry picked from commit 5d56014c61b107dcb5d05c2221c2e844324f304c) --- qa/tasks/qemu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py index f597c08d65b0..b2bca00d8d1b 100644 --- a/qa/tasks/qemu.py +++ b/qa/tasks/qemu.py @@ -115,7 +115,7 @@ def generate_iso(ctx, config): (remote,) = ctx.cluster.only(client).remotes.keys() - clone_dir = '{tdir}/clone.{role}'.format(tdir=testdir, role=client) + clone_dir = '{tdir}/qemu_clone.{role}'.format(tdir=testdir, role=client) remote.run(args=refspec.clone(git_url, clone_dir)) src_dir = os.path.dirname(__file__) @@ -212,7 +212,7 @@ def generate_iso(ctx, config): os.path.join(testdir, 'qemu', 'userdata.' + client), os.path.join(testdir, 'qemu', 'metadata.' + client), '{tdir}/qemu/{client}.test.sh'.format(tdir=testdir, client=client), - '{tdir}/clone.{client}'.format(tdir=testdir, client=client), + '{tdir}/qemu_clone.{client}'.format(tdir=testdir, client=client), ], ) -- 2.47.3