autotest_server option added to the autoqa.conf file. If not set, socket.gethostname() is used. Could be overriden by the --autotest-server parameter. --- autoqa | 8 ++++++-- autoqa.conf | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/autoqa b/autoqa index 9f41c00..e889a9e 100755 --- a/autoqa +++ b/autoqa @@ -38,6 +38,7 @@ conf = { 'testdir': '/usr/share/autotest/client/site_tests', 'hookdir': '/usr/share/autoqa', 'notification_email': '', + 'autotest_server': socket.gethostname(), } cfg_parser = SafeConfigParser() # used by prep_controlfile try: @@ -140,7 +141,7 @@ parser.add_option('--local', action='store_true', dest='local', help='Do not schedule jobs - run test(s) directly on the local machine') parser.add_option('-l', '--list-tests', action='store_true', dest='listtests', help='list the tests for the given hookname - do not run any tests') -parser.add_option('--autotest-server', action='store', default=socket.gethostname(), +parser.add_option('--autotest-server', action='store', default=None, help='Sets the autotest-server hostname. Used for creating URLs to results.\ Hostname of the local machine is used by default.') # Read and validate the hookname @@ -202,7 +203,10 @@ for arch in opts.arch: # args that add another loop here.. testdata = hook.process_testdata(opts, args, arch=arch) if not 'autotest_server' in testdata.keys(): - testdata['autotest_server'] = opts.autotest_server + if opts.autotest_server is not None: + testdata['autotest_server'] = opts.autotest_server + else: + testdata['autotest_server'] = cfg['autotest_server'] # XXX FIXME: tests need to be able to indicate that they do not require # any specific arch (e.g. rpmlint can run on any arch) for test in testlist: diff --git a/autoqa.conf b/autoqa.conf index ed8662a..75efdd8 100644 --- a/autoqa.conf +++ b/autoqa.conf @@ -13,6 +13,11 @@ notification_email = # Default is to schedule jobs with the autotest server using 'atest'. # This is the same as using 'autoqa --local'. #local = true +# Hostname of Autotest server, which stores the test results. +# The same machine as AutoQA is running on is assumed by default - +# socket.gethostname() is used to determine it. +# This value can be overriden with --autotest-server parameter of AutoQA +#autotest_server = please.set.me # The 'test' section is used for systemwide configuration of autoqa tests [test] -- 1.6.6.1