Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/193350

Change subject: WIP cleanup
......................................................................

WIP cleanup

Change-Id: Iaed8edcced6a17d48f77e2a7e09603b020cd1970
---
M jjb/macro.yaml
1 file changed, 0 insertions(+), 75 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/50/193350/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 043dfaa..b147527 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -103,81 +103,6 @@
     builders:
      - shell: /srv/deployment/integration/slave-scripts/bin/json-lint.php .
 
-# Wrapper around cucumber
-# FIXME should be some shell scripts instead
-#
-# Parameters:
-# {tests-path}  where browser tests are located
-# {browser} Type of browser to use (phantomjs, firefox)
-- builder:
-    name: browsertests
-    builders:
-
-     - shell: |
-        # Load context (namely: MW_INSTALL_PATH)
-        . "/srv/deployment/integration/slave-scripts/bin/mw-set-env.sh"
-
-        # Let apache write in sqlite file
-        mkdir -p data
-        chmod a+w data/
-        chmod a+w data/*.sqlite
-
-        # Same for log dir
-        chmod a+w log/
-
-        # And images dir
-        mkdir -p images
-        chmod a+w images/
-
-        # Crazy hack to match production expectations
-        ln -s . w
-
-        TEST_ID=`echo "$ZUUL_PROJECT/$ZUUL_COMMIT/$BUILD_NUMBER" | tr '/' '-'`
-
-        # Post configure MediaWiki
-        echo -n "<?php
-          # Injected by Jenkins Job Builder macro 'browsertests'
-          \$wgServer = 'http://localhost:9413';
-          \$wgScriptPath = '/$TEST_ID/w';
-          \$wgArticlePath = '/$TEST_ID/wiki/\$1';
-          \$wgScript = \$wgStylePath = \$wgLogo = false;
-          " >> "$MW_INSTALL_PATH/LocalSettings.php"
-
-        # On labs:
-        DOCROOT="/mnt/localhost-browsertests"
-
-        # Publish WORKSPACE in Apache
-        ln -s "$MW_INSTALL_PATH" "$DOCROOT/$TEST_ID"
-        curl --location --include "http://localhost:9413/$TEST_ID/"; |head -n42
-
-        # 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"
-
-        cd {tests-path}
-            /srv/deployment/integration/slave-scripts/tools/bundler/bundle 
install --path "$GEM_HOME"
-            export BROWSER="{browser}"
-            export HEADLESS=true  # does not harm phantomjs
-            export MEDIAWIKI_URL="http://localhost:9413/$TEST_ID/wiki/";
-            export API_URL="http://localhost:9413/$TEST_ID/w/api.php";
-            export MEDIAWIKI_USER=WikiAdmin
-            export MEDIAWIKI_PASSWORD=testpass
-            export SCREENSHOT_FAILURES=true
-            export SCREENSHOT_FAILURES_PATH="$WORKSPACE/log"
-            /srv/deployment/integration/slave-scripts/tools/bundler/bundle 
exec cucumber --color \
-                --tags @clean \
-                --tags @{browser} \
-                --format pretty \
-                --format junit --out "$WORKSPACE/log" \
-                --format html --out "$WORKSPACE/log/report.html"
-        EXIT_CODE=$?
-        echo "Cucumber exit code: $EXIT_CODE"
-
-        # symlink cleanup
-        rm "$DOCROOT/$TEST_ID"
-
-        exit $EXIT_CODE
-
 - builder:
     name: csslint-in
     builders:

-- 
To view, visit https://gerrit.wikimedia.org/r/193350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaed8edcced6a17d48f77e2a7e09603b020cd1970
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

Reply via email to