jenkins-bot has submitted this change and it was merged.
Change subject: Normalize ZeroBanner job
......................................................................
Normalize ZeroBanner job
Fix up the ZeroBanner job to reuse the same template as the
other project. It updates a job which is not passing anyway:
browsertests-ZeroBanner-en.m.wikipedia.org-linux-phantomjs
Change-Id: I47d7d4c2bc07fe0efbefdc523dfa7b6dffdf7d05
---
M job_template.yaml
M jobs.yaml
2 files changed, 4 insertions(+), 48 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job_template.yaml b/job_template.yaml
index a7bc633..57fe68c 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -187,49 +187,3 @@
--out "$WORKSPACE/log/junit" \
features/verify_production_wikis.feature \
|| (echo -e "\nJob has failed (exit code: $?)."; false)
-
-# ZeroBanner
-
-- job-template:
- name: 'browsertests-ZeroBanner-{name}-{platform}-{browser}'
- defaults: browsertests
-
- builders:
- - ZeroBanner:
- browser: '{browser}'
- folder: '{folder}'
- mediawiki_url: '{mediawiki_url}'
-
-- builder:
- name: ZeroBanner
- builders:
- - shell: |
- # set up environment variables
- export BROWSER={browser}
- export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
- export SCREENSHOT_FAILURES=true
- export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
-
- # Shared cache of gems to avoid hitting rubygems all the time
- # See https://github.com/bundler/bundler/issues/2856
- export GEM_HOME="$WORKSPACE/../gems"
-
- # install ruby dependencies
- mkdir -p vendor
- gem1.9.3 install --env-shebang -i vendor bundler --no-ri --no-rdoc
- # Prepare some paths lookup
- export GEM_PATH="`pwd`/vendor"
-
- cd tests/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" \
- --tags @{mediawiki_url} \
- || (echo -e "\nJob has failed (exit code: $?)."; false)
diff --git a/jobs.yaml b/jobs.yaml
index 6ffc1d8..8546c3d 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -301,14 +301,16 @@
# ZeroBanner
- project:
- name: en.m.wikipedia.org
+ name: ZeroBanner
browser: phantomjs
folder: tests
headless: 'true'
+ mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
mediawiki_url: en.m.wikipedia.org
+ mediawiki_user: Selenium_user
platform: linux
recipients: *emails-qa
repository: mediawiki/extensions/ZeroBanner
jobs:
- - 'browsertests-ZeroBanner-{name}-{platform}-{browser}'
+ - 'browsertests-{name}-{mediawiki_url}-{platform}-{browser}'
--
To view, visit https://gerrit.wikimedia.org/r/131048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47d7d4c2bc07fe0efbefdc523dfa7b6dffdf7d05
Gerrit-PatchSet: 5
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Cmcmahon <cmcma...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
