[MediaWiki-commits] [Gerrit] Fix broken jobs when BROWSER_TIMEOUT is not set - change (integration/config)

2014-10-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix broken jobs when BROWSER_TIMEOUT is not set
..


Fix broken jobs when BROWSER_TIMEOUT is not set

Updates at browsertests-* jobs.

Change-Id: Iafbe563c72a4cb9cda85d8d69962280fa59bbb7d
---
M jjb/macro-browsertests.yaml
M jjb/macro.yaml
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 62315e8..7ffe8b1 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -4,7 +4,10 @@
   - shell: |
   # set up environment variables
   export BROWSER={browser}
-  export BROWSER_TIMEOUT={browser_timeout}
+  if [ -n {browser_timeout} ]
+  then
+export BROWSER_TIMEOUT={browser_timeout}
+  fi
   export CUCUMBER_TAGS={cucumber_tags}
   export HEADLESS={headless}
   export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 68a48fc..f900b2c 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -652,4 +652,3 @@
 publishers:
  - archive:
 artifacts: 'log/*'
-

-- 
To view, visit https://gerrit.wikimedia.org/r/166547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iafbe563c72a4cb9cda85d8d69962280fa59bbb7d
Gerrit-PatchSet: 4
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org
Gerrit-Reviewer: Dduvall dduv...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fix broken jobs when BROWSER_TIMEOUT is not set - change (integration/config)

2014-10-14 Thread Zfilipin (Code Review) 
Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/166547

Change subject: Fix broken jobs when BROWSER_TIMEOUT is not set
..

Fix broken jobs when BROWSER_TIMEOUT is not set

Updates at browsertests-* jobs.

Change-Id: Iafbe563c72a4cb9cda85d8d69962280fa59bbb7d
---
M jjb/macro.yaml
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/47/166547/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index ca69cd2..2f30bc9 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -659,7 +659,10 @@
   - shell: |
   # set up environment variables
   export BROWSER={browser}
-  export BROWSER_TIMEOUT={browser_timeout}
+  if [ -n {browser_timeout} ]
+  then
+export BROWSER_TIMEOUT={browser_timeout}
+  fi
   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/166547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iafbe563c72a4cb9cda85d8d69962280fa59bbb7d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin zfili...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits