Zfilipin has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/373103 )

Change subject: WIP Create Jenkins job that runs RelatedArticles Selenium tests 
daily
......................................................................


WIP Create Jenkins job that runs RelatedArticles Selenium tests daily

Creates job selenium-RelatedArticles-jessie.

Bug: T171847
Change-Id: Ibeb25fa55ef51230958ed9ae552d6e6e7e64f3fe
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
3 files changed, 53 insertions(+), 16 deletions(-)

Approvals:
  jenkins-bot: Verified



diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 5f8d53b..f172f02 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -329,6 +329,22 @@
            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 c9f549b..e99693a 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -427,3 +427,40 @@
     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 ae24e87..a9a2771 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -44,22 +44,6 @@
      - 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/373103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeb25fa55ef51230958ed9ae552d6e6e7e64f3fe
Gerrit-PatchSet: 6
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

Reply via email to