Merge pull request kubernetes#9709 from BenTheElder/this-is-why-we-do…

…nt-touch-bootstrap get artifacts env correctly
bobbypage · Oct 5, 2018 · 30a377d · 30a377d
2 parents 624317e + 2994d84
commit 30a377d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/jenkins/bootstrap.py b/jenkins/bootstrap.py
@@ -808,9 +808,9 @@ def setup_logging(path):
 
 
 def get_artifacts_dir():
-    if JOB_ARTIFACTS_ENV in os.environ:
-        return JOB_ARTIFACTS_ENV
-    return os.path.join(os.getenv(WORKSPACE_ENV, os.getcwd()), '_artifacts')
+    return os.getenv(
+        JOB_ARTIFACTS_ENV,
+        os.path.join(os.getenv(WORKSPACE_ENV, os.getcwd()), '_artifacts'))
 
 
 def setup_magic_environment(job, call):