summaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2020-09-11 11:22:10 +1200
committerDouglas Bagnall <dbagnall@samba.org>2020-10-01 01:18:39 +0000
commit5419774b23ef231216fd9c37c63ff83620c9faf3 (patch)
treeaa79c3cd0d99f36f5a06d29c03fdeba22d9d8263 /script
parent21197bb57d36771f772cb28221edf4b12b5f7b33 (diff)
downloadsamba-5419774b23ef231216fd9c37c63ff83620c9faf3.tar.gz
autobuild: Remove the os.getpid() from the autobuild directory
This might help our CI runners get a ccache hit by keeping the path constant. Otherwise, we only get a good ccache hit rate if the docker container gives us the same pid each time. Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'script')
-rwxr-xr-xscript/autobuild.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index 89699826e62..a54d4206958 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -56,6 +56,8 @@ parser.add_option("--keeplogs", help="keep logs", default=False, action="store_t
parser.add_option("--nocleanup", help="don't remove test tree", default=False, action="store_true")
parser.add_option("--testbase", help="base directory to run tests in (default %s)" % def_testbase,
default=def_testbase)
+parser.add_option("--full-testbase", help="full base directory to run tests in (default %s/b$PID)" % def_testbase,
+ default=None)
parser.add_option("--passcmd", help="command to run on success", default=None)
parser.add_option("--verbose", help="show all commands as they are run",
default=False, action="store_true")
@@ -97,7 +99,10 @@ if options.retry:
if options.rebase is None:
raise Exception('You can only use --retry if you also rebase')
-testbase = "%s/b%u" % (options.testbase, os.getpid())
+if options.full_testbase is not None:
+ testbase = options.full_testbase
+else:
+ testbase = "%s/b%u" % (options.testbase, os.getpid())
test_master = "%s/master" % testbase
test_prefix = "%s/prefix" % testbase
test_tmpdir = "%s/tmp" % testbase