Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/166025
Change subject: Allow setting the browser-timeout in browsertests ...................................................................... Allow setting the browser-timeout in browsertests This allows browsertest projects to change the default browser-timeout. This is already supported in the mediawiki-selenium gem. See: https://github.com/wikimedia/mediawiki-selenium#028-2014-03-06 Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051 --- M jjb/job-templates-browsertests.yaml M jjb/macro.yaml 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/25/166025/1 diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml index d2ab5a1..f2a7ae0 100644 --- a/jjb/job-templates-browsertests.yaml +++ b/jjb/job-templates-browsertests.yaml @@ -29,6 +29,7 @@ - shell: mkdir -p "$WORKSPACE/log/junit" - browsertest-website-version: browser: '{browser}' + browser_timeout: '{browser_timeout}' cucumber_tags: '{cucumber_tags}' headless: '{headless}' folder: '{folder}' @@ -78,6 +79,7 @@ - defaults: name: browsertests node: contintLabsSlave && UbuntuPrecise + browser_timeout: '' repository_host: 'gerrit.wikimedia.org/r' cucumber_tags: '' @@ -106,6 +108,7 @@ - shell: mkdir -p "$WORKSPACE/log/junit" - browsertest-website: browser: '{browser}' + browser_timeout: '{browser_timeout}' cucumber_tags: '{cucumber_tags}' headless: '{headless}' folder: '{folder}' diff --git a/jjb/macro.yaml b/jjb/macro.yaml index d7b6845..ca69cd2 100644 --- a/jjb/macro.yaml +++ b/jjb/macro.yaml @@ -659,6 +659,7 @@ - shell: | # set up environment variables export BROWSER={browser} + export BROWSER_TIMEOUT={browser_timeout} export CUCUMBER_TAGS={cucumber_tags} export HEADLESS={headless} export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php @@ -778,6 +779,7 @@ - shell: | # set up environment variables export BROWSER={browser} + export BROWSER_TIMEOUT={browser_timeout} export CUCUMBER_TAGS={cucumber_tags} export HEADLESS={headless} export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php -- To view, visit https://gerrit.wikimedia.org/r/166025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia56df27e9cdfe57cf9558e5c64ea1bd58c9ef051 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
