[autotest] Move up results directory setup
Moving this up allows us to use the inferred results directory while
setting up SSP.
BUG=chromium:678430
TEST=Run a local test using autoserv
Change-Id: Id8faef08287bb6bffe61ff6521f2b484b5b8eb12
Reviewed-on: https://chromium-review.googlesource.com/537975
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/server/autoserv b/server/autoserv
index 0a7f520..1bedcb1 100755
--- a/server/autoserv
+++ b/server/autoserv
@@ -616,21 +616,6 @@
parser.parser.print_help()
sys.exit(1)
- # If the job requires to run with server-side package, try to stage server-
- # side package first. If that fails with error that autotest server package
- # does not exist, fall back to run the job without using server-side
- # packaging. If option warn_no_ssp is specified, that means autoserv is
- # running in a drone does not support SSP, thus no need to stage server-side
- # package.
- ssp_url = None
- ssp_url_warning = False
- if (not parser.options.warn_no_ssp and parser.options.require_ssp):
- ssp_url, ssp_error_msg = _stage_ssp(parser)
- # The build does not have autotest server package. Fall back to not
- # to use server-side package. Logging is postponed until logging being
- # set up.
- ssp_url_warning = not ssp_url
-
if parser.options.no_logging:
results = None
else:
@@ -653,6 +638,21 @@
if not os.path.isdir(results):
os.makedirs(results)
+ # If the job requires to run with server-side package, try to stage server-
+ # side package first. If that fails with error that autotest server package
+ # does not exist, fall back to run the job without using server-side
+ # packaging. If option warn_no_ssp is specified, that means autoserv is
+ # running in a drone does not support SSP, thus no need to stage server-side
+ # package.
+ ssp_url = None
+ ssp_url_warning = False
+ if (not parser.options.warn_no_ssp and parser.options.require_ssp):
+ ssp_url, ssp_error_msg = _stage_ssp(parser)
+ # The build does not have autotest server package. Fall back to not
+ # to use server-side package. Logging is postponed until logging being
+ # set up.
+ ssp_url_warning = not ssp_url
+
# Server-side packaging will only be used if it's required and the package
# is available. If warn_no_ssp is specified, it means that autoserv is
# running in a drone does not have SSP supported and a warning will be logs.
