Merge "Create git_http_low_speed_limit / git_http_low_speed_time" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
index ff1a523..c081235 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,8 +45,7 @@
name: openstack-infra/zuul
infra-check:
jobs:
- - build-openstack-infra-sphinx-docs:
- success-url: 'html/feature/zuulv3/'
+ - build-openstack-sphinx-docs:
irrelevant-files:
- zuul/cmd/migrate.py
- playbooks/zuul-migrate/.*
@@ -67,8 +66,10 @@
- playbooks/zuul-migrate/.*
infra-gate:
jobs:
- - build-openstack-infra-sphinx-docs:
- success-url: 'html/feature/zuulv3/'
+ - build-openstack-sphinx-docs:
+ irrelevant-files:
+ - zuul/cmd/migrate.py
+ - playbooks/zuul-migrate/.*
- tox-pep8
- tox-py35:
irrelevant-files:
diff --git a/zuul/ansible/paths.py b/zuul/ansible/paths.py
index 04daef4..05f9fdc 100644
--- a/zuul/ansible/paths.py
+++ b/zuul/ansible/paths.py
@@ -24,7 +24,7 @@
def _is_safe_path(path):
full_path = os.path.realpath(os.path.abspath(os.path.expanduser(path)))
- if not full_path.startswith(os.path.abspath(os.path.curdir)):
+ if not full_path.startswith(os.path.abspath(os.path.expanduser('~'))):
return False
return True
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index 52be5a3..b19d23c 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1763,15 +1763,15 @@
if result is not None:
result = self.RESULT_MAP[result]
msg = "{phase} {step} {result}: [{trusted} : {playbook}@{branch}]"
- msg.format(phase=phase, step=step, result=result,
- trusted=trusted, playbook=playbook, branch=branch)
+ msg = msg.format(phase=phase, step=step, result=result,
+ trusted=trusted, playbook=playbook, branch=branch)
else:
msg = "{phase} {step}: [{trusted} : {playbook}@{branch}]"
- msg.format(phase=phase, step=step, trusted=trusted,
- playbook=playbook, branch=branch)
+ msg = msg.format(phase=phase, step=step, trusted=trusted,
+ playbook=playbook, branch=branch)
with open(self.jobdir.job_output_file, 'a') as job_output:
- job_output.write("{now} | {msg}".format(
+ job_output.write("{now} | {msg}\n".format(
now=datetime.datetime.now(),
msg=msg))