jenkins-bot has submitted this change and it was merged.
Change subject: Clean up directories and archive configs for Relevance Lab runs
......................................................................
Clean up directories and archive configs for Relevance Lab runs
- delete existing queries/<name> and comparisons/<name> directories
to clear out cruft between runs
- archived config and queries so runs are more easily reproduced:
copy runSearch queries to queries/<name>/queries
copy runSearch options to queries/<name>/config.json
copy main config to comparisons/<name>/config.ini
No bug; this is my 10% time project
Change-Id: Ie4e55f4625221dda4a0485132bdee8218471a534
---
M relevancyRunner.py
1 file changed, 12 insertions(+), 5 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/relevancyRunner.py b/relevancyRunner.py
index be3d1a4..f416279 100755
--- a/relevancyRunner.py
+++ b/relevancyRunner.py
@@ -19,6 +19,7 @@
import argparse
import ConfigParser
import pipes
+import shutil
import subprocess
import re
@@ -27,21 +28,26 @@
return re.sub(r'[^a-zA-Z0-9]', '-', name)
-def ensureDir(dirname):
- if not os.path.exists(dirname):
- os.makedirs(dirname)
+def refreshDir(dirname):
+ # Delete the dir if it exists to clean out cruft from previous runs
+ if os.path.exists(dirname):
+ shutil.rmtree(dirname)
+ os.makedirs(dirname)
def runSearch(config, section):
qname = getSafeName(config.get(section, 'name'))
qdir = config.get('settings', 'workDir') + "/queries/" + qname
- ensureDir(qdir)
+ refreshDir(qdir)
cmdline = config.get('settings', 'searchCommand')
if config.has_option(section, 'config'):
cmdline += " --options " + pipes.quote(open(config.get(section,
'config')).read())
+ shutil.copyfile(config.get(section, 'config'),
+ qdir + '/config.json') # archive search config
runCommand("cat %s | ssh %s %s > %s" % (config.get(section, 'queries'),
config.get('settings', 'labHost'),
pipes.quote(cmdline), qdir +
"/results"))
+ shutil.copyfile(config.get(section, 'queries'), qdir + '/queries') #
archive queries
return qdir + "/results"
@@ -73,7 +79,8 @@
comparisonDir = "%s/comparisons/%s_%s" % (config.get('settings', 'workDir'),
getSafeName(config.get('test1',
'name')),
getSafeName(config.get('test2',
'name')))
-ensureDir(comparisonDir)
+refreshDir(comparisonDir)
+shutil.copyfile(args.config, comparisonDir + "/config.ini") # archive
comparison config
runCommand("%s %s %s %s" % (config.get('settings', 'jsonDiffTool'),
comparisonDir + "/diffs", res1, res2))
--
To view, visit https://gerrit.wikimedia.org/r/252580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4e55f4625221dda4a0485132bdee8218471a534
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/discovery/relevancylab
Gerrit-Branch: master
Gerrit-Owner: Tjones <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
