Zfilipin has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373277 )
Change subject: Revert "WIP Create Jenkins job that runs RelatedArticles
Selenium tests daily"
......................................................................
Revert "WIP Create Jenkins job that runs RelatedArticles Selenium tests daily"
This reverts commit 2e40af3c928e34420f570ebadf41c666a6fa3969.
Change-Id: I20b2c0daf49ab07c38aa4253c20941455ff6888d
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
3 files changed, 16 insertions(+), 53 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index f172f02..5f8d53b 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -329,22 +329,6 @@
cd ./src/extensions/$EXT_NAME/tests/selenium
.
'/srv/deployment/integration/slave-scripts/bin/mw-selenium-setup.sh'
fi
- # Run selenium script if it exists. The localhost vhost is setup by
- # qunit-karma already
- - shell: |
- . /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
-
- cd $MW_INSTALL_PATH
- if [ -f ./tests/selenium/wdio.conf.js ]; then
- chromedriver --url-base=/wd/hub --port=4444 &
- # Make sure it is killed to prevent file descriptors leak
- function kill_chromedriver() {
- killall chromedriver > /dev/null
- }
- trap kill_chromedriver EXIT
-
- ./node_modules/.bin/grunt webdriver:test
- fi
# Similar to mw-selenium-nodepool job but runs `bundle exec rake spec` instead
of `bundle exec cucumber` T146916
- builder:
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e99693a..c9f549b 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -427,40 +427,3 @@
jobs:
- '{name}-jsduck'
- 'mwext-VisualEditor-npm-node-6-jessie'
-
-# Run RelatedArticles Selenium tests daily targeting beta cluster
-# similar to mediawiki-core-qunit-selenium-jessie
-- job:
- name: 'selenium-RelatedArticles-jessie'
- node: ci-jessie-wikimedia
- concurrent: true
- triggers:
- - timed: '@daily'
- properties:
- - build-discarder:
- days-to-keep: 15
- parameters:
- - string:
- name: ZUUL_PROJECT
- default: mediawiki/extensions/RelatedArticles
- - string:
- name: ZUUL_BRANCH
- default: master
- builders:
- - castor-load
- - prepare-mediawiki-zuul-project
- - qunit-karma
- - shell: |
- . /srv/deployment/integration/slave-scripts/bin/mw-set-env.sh
- chromedriver --url-base=/wd/hub --port=4444 &
- cd $MW_INSTALL_PATH
- MEDIAWIKI_USER='Selenium user'
MW_SERVER=https://en.wikipedia.beta.wmflabs.org:443 MW_SCRIPT_PATH=/w
./node_modules/.bin/wdio tests/selenium/wdio.conf.jenkins.js --spec
extensions/RelatedArticles/tests/selenium/specs/*.js
- - assert-no-mediawiki-errors
- publishers:
- - castor-save
- - archive-log-dir
- - junit:
- results: 'log/junit*.xml,log/WDIO.xunit*.xml'
- # Qunit does not generate Junit file and we might skip selenium
- allow-empty-results: true
-
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index a9a2771..ae24e87 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -44,6 +44,22 @@
- prepare-mediawiki-zuul-project
- qunit-karma
- mw-wdio-nodepool
+ # Run selenium script if it exists. The localhost vhost is setup by
+ # qunit-karma already
+ - shell: |
+ . /srv/deployment/integration/slave-scripts/bin/mw-set-env-localhost.sh
+
+ cd $MW_INSTALL_PATH
+ if [ -f ./tests/selenium/wdio.conf.js ]; then
+ chromedriver --url-base=/wd/hub --port=4444 &
+ # Make sure it is killed to prevent file descriptors leak
+ function kill_chromedriver() {{
+ killall chromedriver > /dev/null
+ }}
+ trap kill_chromedriver EXIT
+
+ ./node_modules/.bin/grunt webdriver:test
+ fi
- assert-no-mediawiki-errors
publishers:
- castor-save
--
To view, visit https://gerrit.wikimedia.org/r/373277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20b2c0daf49ab07c38aa4253c20941455ff6888d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <zfili...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org>
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
