Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193577
Change subject: Refactor VisualEditor JJB builder for production status
browsertest to use Cucumber tag instead of calling a file directly
......................................................................
Refactor VisualEditor JJB builder for production status browsertest to use
Cucumber tag instead of calling a file directly
Updated job: browsertests-VisualEditor-production-linux-firefox-sauce
Bug: T90423
Change-Id: Ic65e65ada53b9e85a44704d348507972980646a9
---
M jjb/browsertests.yaml
M jjb/job-templates-browsertests.yaml
2 files changed, 9 insertions(+), 54 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/193577/1
diff --git a/jjb/browsertests.yaml b/jjb/browsertests.yaml
index e4b0088..49d980c 100644
--- a/jjb/browsertests.yaml
+++ b/jjb/browsertests.yaml
@@ -427,6 +427,7 @@
- 'browsertests-{name}-production-{platform}-{browser}-sauce':
browser: firefox
+ cucumber_tags: '@production'
- 'browsertests-{name}-language-screenshot-{platform}-{browser}':
browser: firefox
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index a018f02..d4d4522 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -213,60 +213,14 @@
- timed: "@weekly"
builders:
- - VisualEditor:
+ - shell: mkdir -p "$WORKSPACE/log/junit"
+ - browsertest-website:
browser: '{browser}'
+ browser_timeout: '{browser_timeout}'
+ cucumber_tags: '{cucumber_tags}'
+ headless: '{headless}'
folder: '{folder}'
+ mediawiki_credentials_id: '{mediawiki_credentials_id}'
+ mediawiki_url: '{mediawiki_url}'
platform: '{platform}'
-
-- builder:
- name: VisualEditor
- builders:
- - shell: |
- # set up environment variables
- export BROWSER={browser}
- export HEADLESS=false
- export PLATFORM='{platform}'
-
- # We only care about one version of our browser and do not need a job
- # per version. Thus the versions to use are hardcoded there.
- #
- # VERSION is used for SauceLabs
- #
- case "$BROWSER" in
- 'firefox')
- export VERSION=27
- ;;
- 'chrome')
- # Empty version will get us the latest one
- export VERSION=''
- ;;
- *)
- echo "Browser '$BROWSER' unsupported. Can not determine
version"
- exit 1
- ;;
- esac
- echo "Using browser: $BROWSER at version $VERSION"
-
- # Shared cache of gems to avoid hitting rubygems all the time
- # See https://github.com/bundler/bundler/issues/2856
- export GEM_HOME="$WORKSPACE/../gems/2.0.0"
-
- # install ruby dependencies
- mkdir -p vendor
- gem2.0 install --env-shebang -i vendor bundler --no-ri --no-rdoc
- # Prepare some paths lookup
- export GEM_PATH="`pwd`/vendor"
-
- cd {folder}/browser/
- "$WORKSPACE"/vendor/bin/bundle install --verbose
-
- # run tests
- "$WORKSPACE"/vendor/bin/bundle exec cucumber \
- --backtrace \
- --color \
- --verbose \
- --format pretty \
- --format Cucumber::Formatter::Sauce \
- --out "$WORKSPACE/log/junit" \
- features/verify_production_wikis.feature \
- || (echo -e "\nJob has failed (exit code: $?)."; false)
+ version: '{version}'
--
To view, visit https://gerrit.wikimedia.org/r/193577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic65e65ada53b9e85a44704d348507972980646a9
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
