jenkins-bot has submitted this change and it was merged.

Change subject: Support MediaWiki-Selenium 1.0.0
......................................................................


Support MediaWiki-Selenium 1.0.0

The 1.0.0 release of MediaWiki-Selenium uses a locally defined
`environments.yml` file to describe default configuration for various
environments. It requires `MEDIAWIKI_ENVIRONMENT` to be set.

Change-Id: Ibe425873776d70a2305a537b95d817562f928646
---
M jjb/macro-browsertests.yaml
1 file changed, 11 insertions(+), 2 deletions(-)

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



diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 3eea851..307ce3c 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -4,8 +4,7 @@
       - shell: |
           # set up environment variables
           export BROWSER={browser}
-          if [ -n "{browser_timeout}" ]
-          then
+          if [ -n "{browser_timeout}" ]; then
             export BROWSER_TIMEOUT={browser_timeout}
           fi
           export CUCUMBER_TAGS={cucumber_tags}
@@ -18,6 +17,16 @@
           export SCREENSHOT_FAILURES=true
           export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
 
+          # Set MEDIAWIKI_ENVIRONMENT for mediawiki-selenium >= 1.0.0
+          case '{mediawiki_url}' in
+            'en.wikipedia.beta.wmflabs.org')
+              export MEDIAWIKI_ENVIRONMENT=beta
+              ;;
+            'test2.wikipedia.org')
+              export MEDIAWIKI_ENVIRONMENT=test2
+              ;;
+          esac
+
           set +x
           if [ -z $MEDIAWIKI_CREDENTIALS ]; then
               echo "\$MEDIAWIKI_CREDENTIALS is empty. Check job configuration."

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe425873776d70a2305a537b95d817562f928646
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to