Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/273489
Change subject: WIP Simplify creating of Jenkins jobs for running browser tests
daily
......................................................................
WIP Simplify creating of Jenkins jobs for running browser tests daily
Bug: T128190
Change-Id: Iec3626779be0dd7d8701626a96cd2560a8060933
---
M jjb/browsertests.yaml
M jjb/job-templates-browsertests.yaml
M jjb/macro-browsertests.yaml
3 files changed, 7 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/89/273489/1
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index 8846852..eb760e4 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -166,8 +166,6 @@
- project:
name: Math
defaults: browsertests
- folder: tests
- headless: 'false'
mediawiki_credentials_id: Selenium_user-at-beta.wmflabs.org
mediawiki_url: en.wikipedia.beta.wmflabs.org
platform: linux
@@ -177,6 +175,7 @@
jobs:
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
browser: chrome
+ target: beta_chrome
- 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-sauce':
browser: firefox
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index 08561dc..541f856 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -96,12 +96,11 @@
browser: '{browser}'
browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
- headless: '{headless}'
- folder: '{folder}'
mediawiki_credentials_id: '{mediawiki_credentials_id}'
mediawiki_url: '{mediawiki_url}'
name: '{name}'
platform: '{platform}'
+ target: '{target}'
version: '{version}'
publishers:
@@ -237,8 +236,6 @@
browser: '{browser}'
browser_timeout: '{browser_timeout}'
cucumber_tags: '{cucumber_tags}'
- headless: '{headless}'
- folder: '{folder}'
mediawiki_credentials_id: '{mediawiki_credentials_id}'
mediawiki_url: '{mediawiki_url}'
name: '{name}'
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index f05c91b..a62d7e9 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -3,12 +3,11 @@
builders:
- shell: |
# set up environment variables
- export BROWSER={browser}
+ export MEDIAWIKI_ENVIRONMENT={target}
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
export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
export PLATFORM='{platform}'
@@ -17,24 +16,8 @@
export SCREENSHOT_FAILURES=true
export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
- # headless means local headless browser, thus disable saucelabs
- if [ $HEADLESS = 'true' ]; then
- unset SAUCE_ONDEMAND_ACCESS_KEY
- unset SAUCE_ONDEMAND_USERNAME
- fi
-
# Log results to Raita
export RAITA_URL=http://integration-raita.eqiad.wmflabs:9200/raita
-
- # Set MEDIAWIKI_ENVIRONMENT for mediawiki-selenium >= 1.0.0
- case '{mediawiki_url}' in
- *.beta.wmflabs.org)
- export MEDIAWIKI_ENVIRONMENT=beta
- ;;
- test2.wikipedia.org)
- export MEDIAWIKI_ENVIRONMENT=test2
- ;;
- esac
set +x
if [ -z $MEDIAWIKI_CREDENTIALS ]; then
@@ -86,7 +69,6 @@
export GEM_PATH="`pwd`/vendor"
"$WORKSPACE"/vendor/bin/bundle install --verbose
- cd {folder}/browser/
if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
CUCUMBER_PARAMETER="@language_screenshot"
@@ -110,17 +92,11 @@
if [ "wikidata.beta.wmflabs.org" = "{mediawiki_url}" ]; then
pretty=""
fi
+ ### T128190 ###
+ git fetch https://gerrit.wikimedia.org/r/mediawiki/extensions/Math
refs/changes/61/273461/7 && git checkout FETCH_HEAD
+ ### T128190 ###
# run tests
- "$WORKSPACE"/vendor/bin/bundle exec cucumber \
- --backtrace \
- --color \
- --verbose \
- $pretty \
- --format Cucumber::Formatter::Sauce \
- --out "$WORKSPACE/log/junit" \
- --tags $CUCUMBER_PARAMETER \
- --tags @$BROWSER_TAG \
- || (echo -e "\nJob has failed (exit code: $?)."; false)
+ "$WORKSPACE"/vendor/bin/bundle exec rake {target}
if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
"$WORKSPACE"/vendor/bin/bundle exec upload
--
To view, visit https://gerrit.wikimedia.org/r/273489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec3626779be0dd7d8701626a96cd2560a8060933
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
