Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226680
Change subject: Add jenkings test for BoilerPlate
......................................................................
Add jenkings test for BoilerPlate
Change-Id: I48ab39e330ebc71266b72cae8449cc2f6da495fe
---
M jjb/macro-browsertests.yaml
M zuul/layout.yaml
2 files changed, 31 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/80/226680/1
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 7de1948..5cacf6e 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -9,18 +9,18 @@
fi
export CUCUMBER_TAGS={cucumber_tags}
export HEADLESS={headless}
- export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
- export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
+
export PLATFORM='{platform}'
# Replace PLATFORM underscores (Jenkins) to spaces (SauceLabs)
export PLATFORM=${{PLATFORM//_/ }}
+
export SCREENSHOT_FAILURES=true
export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
# Log results to Raita
export RAITA_URL=http://integration-raita.eqiad.wmflabs:9200/raita
- # Set MEDIAWIKI_ENVIRONMENT for mediawiki-selenium >= 1.0.0
+ # Set MEDIAWIKI_ENVIRONMENT for mw-selenium 1.x
case '{mediawiki_url}' in
*.beta.wmflabs.org)
export MEDIAWIKI_ENVIRONMENT=beta
@@ -31,15 +31,34 @@
esac
set +x
+
if [ -z $MEDIAWIKI_CREDENTIALS ]; then
echo "\$MEDIAWIKI_CREDENTIALS is empty. Check job configuration."
exit 1
fi
- export MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:`
- export MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2-
-d:`
- export MEDIAWIKI_PASSWORD_VARIABLE='MEDIAWIKI_PASSWORD'
+
+ MEDIAWIKI_USER=`echo $MEDIAWIKI_CREDENTIALS | cut -f1 -d:`
+ MEDIAWIKI_PASSWORD=`echo $MEDIAWIKI_CREDENTIALS | cut -f2- -d:`
+
set -x
+ MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
+ MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
+
+ # Let test suites running mw-selenium 1.x use their own
+ # configuration for URLs and users, but export our settings for
+ # versions 0.x
+ if [ ! -f "{folder}/browser/environments.yml" ]; then
+ export MEDIAWIKI_API_URL
+ export MEDIAWIKI_URL
+ export MEDIAWIKI_USER
+ fi
+
+ # Export the MW user password regardless, as passwords are not kept
+ # in test suite configurations
+ export MEDIAWIKI_PASSWORD
+
+
# VERSION is used for SauceLabs
export VERSION={version}
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a3be20e..ba3dfa5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3071,6 +3071,12 @@
- name: jsonlint
- name: extension-unittests-generic
+ - name: mediawiki/extensions/BoilerPlate
+ template:
+ - name: jshint
+ - name: jsonlint
+ - name: extension-unittests
+
- name: mediawiki/extensions/BookManager
template:
- name: jshint
--
To view, visit https://gerrit.wikimedia.org/r/226680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I48ab39e330ebc71266b72cae8449cc2f6da495fe
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
