Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389704 )
Change subject: Support build varying timeout for tox-docker
......................................................................
Support build varying timeout for tox-docker
operations/software/cumin and search/mjolinir have tox jobs that takes a
while. Specially on the initial run since they download/install a few
dependencies.
Enhance tox-jessie so we can pass a specific value to the timeout
wrapper. Default stays to three minutes.
Switch cumin to a more specific job.
On both repos, raise the timeout from 3 to 6 minutes.
Change-Id: Ic3b488215713b3cb01f46b9e5c3526a7eaa2648f
---
M jjb/operations-misc.yaml
M jjb/python-jobs.yaml
M jjb/search.yaml
M zuul/layout.yaml
4 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/04/389704/1
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index 7cca522..8ef8fcb 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -52,6 +52,8 @@
- project:
name: 'cumin'
jobs:
+ - '{name}-tox-docker':
+ build_timeout: 6 # minutes
- tox-publish:
docenv: 'sphinx'
docsrc: 'doc/build/html'
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 2b2fe89..94c2bc0 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -80,7 +80,7 @@
logdir: '/log'
wrappers:
- timeout:
- timeout: 3 # minutes
+ timeout: '{obj:build_timeout|3}' # minutes
- timestamps
- ansicolor
publishers:
diff --git a/jjb/search.yaml b/jjb/search.yaml
index 44cd32a..f9a0a22 100644
--- a/jjb/search.yaml
+++ b/jjb/search.yaml
@@ -21,6 +21,7 @@
jobs:
- '{name}-tox-docker':
docker_image_var: wmfreleng/tox-pyspark:v2017.11.07.12.13
+ build_timeout: 6 # minutes
# Sadly this does not test the python code with the jvm code, instead
# using the last release of the jvm code, But it's a good start.
- '{name}-maven':
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8de8023..5ec43eb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2452,8 +2452,9 @@
- name: operations/software/cumin
test:
- debian-glue-backports-non-voting
- template:
- - name: tox-jessie # times out
+ - cumin-tox-docker
+ gate-and-submit:
+ - cumin-tox-docker
postmerge:
- cumin-tox-publish
publish:
--
To view, visit https://gerrit.wikimedia.org/r/389704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3b488215713b3cb01f46b9e5c3526a7eaa2648f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
