jenkins-bot has submitted this change and it was merged.
Change subject: phase out /srv/slave-scripts
......................................................................
phase out /srv/slave-scripts
Now deployed with Wikimedia deployment system, thus /srv/slave-scripts
is now under:
/srv/deployment/integration/slave-scripts
bug: 57063
Change-Id: Ie99d44a328d157569edc3c763243a2cb4cd4b040
---
M macro.yaml
M mediawiki-extensions.yaml
M mediawiki.yaml
M mobile.yaml
M operations-puppet.yaml
M parsoid.yaml
6 files changed, 27 insertions(+), 27 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index 5a0eb7b..b190469 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -6,14 +6,14 @@
name: erblint-HEAD
builders:
- shell: |
- /srv/slave-scripts/bin/git-changed-in-head erb \
+ /srv/deployment/integration/slave-scripts/bin/git-changed-in-head erb \
| xargs -n1 -I {} -t sh -c 'erb -P -x -T - {} | ruby -c'
- builder:
name: pplint-HEAD
builders:
- shell: |
- /srv/slave-scripts/bin/git-changed-in-head pp \
+ /srv/deployment/integration/slave-scripts/bin/git-changed-in-head pp \
| xargs -n1 -t puppet parser validate
# Lint whitespace in directory {dir}. Usefull when the Git repository has
@@ -59,8 +59,8 @@
- shell: |
#!/bin/bash -xe
cd "{dir}"
- /srv/slave-scripts/bin/jshint --version
- /srv/slave-scripts/bin/jshint .
+ /srv/deployment/integration/slave-scripts/bin/jshint --version
+ /srv/deployment/integration/slave-scripts/bin/jshint .
- builder:
name: jshint
@@ -162,7 +162,7 @@
curl --include
"http://localhost:9412/$TEST_ID/index.php?title=Special:BlankPage"; | head -n42
curl --include
"http://localhost:9412/$TEST_ID/load.php?debug=true&modules=startup&only=scripts";
| head -n42
# Run QUnit tests via PhantomJS
- /srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit{querystring}";
+ /srv/deployment/integration/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit{querystring}";
gqec=$?
# Clean up
rm /srv/localhost/qunit/$TEST_ID
@@ -223,12 +223,12 @@
- builder:
name: mw-apply-settings
builders:
- - shell: "/srv/slave-scripts/bin/mw-apply-settings.sh"
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-apply-settings.sh"
- builder:
name: mw-get-extensions
builders:
- - shell: "/srv/slave-scripts/tools/fetch-mw-ext {dependencies}"
+ - shell: "/srv/deployment/integration/slave-scripts/tools/fetch-mw-ext
{dependencies}"
- builder:
name: mw-run-update-script
@@ -239,7 +239,7 @@
- builder:
name: mw-install-sqlite
builders:
- - shell: "/srv/slave-scripts/bin/mw-install-sqlite.sh"
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh"
- builder:
name: mw-setup-extension
@@ -260,7 +260,7 @@
- builder:
name: mw-run-phpunit-allexts
builders:
- - shell: '/srv/slave-scripts/bin/mw-run-phpunit-allexts.sh'
+ - shell:
'/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit-allexts.sh'
# Generic phpunit builder, output junit log
# Should be used with publisher 'phpunit-junit'
@@ -330,7 +330,7 @@
name: phplint
builders:
- shell: |
- /srv/slave-scripts/bin/git-changed-in-head php php5 inc phtml \
+ /srv/deployment/integration/slave-scripts/bin/git-changed-in-head php
php5 inc phtml \
| xargs -n1 -t php -l
# run phpcs on any .php and .inc files in the workspace
@@ -341,7 +341,7 @@
- shell: |
/srv/deployment/integration/phpcs/vendor/bin/phpcs -v -s . \
--encoding=utf-8 \
- --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
+
--standard=/srv/deployment/integration/slave-scripts/tools/mwcodesniffer/MediaWiki
\
--extensions=php,inc \
--ignore=languages/messages/Messages*.php,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
@@ -354,7 +354,7 @@
name: phpcs-HEAD
builders:
- shell: |
- PHPCS_FILES=$(/srv/slave-scripts/bin/git-changed-in-head php php5 inc
sample)
+
PHPCS_FILES=$(/srv/deployment/integration/slave-scripts/bin/git-changed-in-head
php php5 inc sample)
# No file? No point in proceeding any further (bug 44567)
if [ -z "$PHPCS_FILES" ]; then
echo "Skipping phpcs: no file remaining to process"
@@ -363,7 +363,7 @@
/srv/deployment/integration/phpcs/vendor/bin/phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
+
--standard=/srv/deployment/integration/slave-scripts/tools/mwcodesniffer/MediaWiki
\
--ignore=languages/messages/Messages,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
--report-full
@@ -371,22 +371,22 @@
- builder:
name: phpcs-strict
builders:
- - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh
+ - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
- builder:
name: phpcs-strict-HEAD
builders:
- - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh HEAD
+ - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
HEAD
- builder:
name: phpcs-lenient
builders:
- - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings
+ - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
nowarnings
- builder:
name: phpcs-lenient-HEAD
builders:
- - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings HEAD
+ - shell: /srv/deployment/integration/slave-scripts/bin/run-phpcs-mw.sh
nowarnings HEAD
- publisher:
name: phpcs
@@ -435,7 +435,7 @@
- builder:
name: yaml-lint
builders:
- - shell: '/srv/slave-scripts/tools/yamllint.py "$WORKSPACE"'
+ - shell: '/srv/deployment/integration/slave-scripts/tools/yamllint.py
"$WORKSPACE"'
- publisher:
name: archive-log-dir
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 1f015dc..e67c4c9 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -53,12 +53,12 @@
curl --location --include "http://localhost:9413/$TEST_ID/"; |head -n42
cd extensions/{ext-name}/tests/browser
- /srv/slave-scripts/tools/bundler/bundle install --path vendor
+ /srv/deployment/integration/slave-scripts/tools/bundler/bundle
install --path vendor
export BROWSER_LABEL="phantomjs"
export
MEDIAWIKI_URL="http://localhost:9413/$TEST_ID/index.php?title=";
export MEDIAWIKI_USER=WikiAdmin
export MEDIAWIKI_PASSWORD=testpass
- /srv/slave-scripts/tools/bundler/bundle exec cucumber --color \
+ /srv/deployment/integration/slave-scripts/tools/bundler/bundle
exec cucumber --color \
-p ciwmf \
-t ~@phantomjs-bug \
--format pretty \
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 173114f..106490b 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -70,7 +70,7 @@
triggers:
- zuul
builders:
- - shell: "/srv/slave-scripts/tools/mwcore-docgen.sh"
+ - shell:
"/srv/deployment/integration/slave-scripts/tools/mwcore-docgen.sh"
- job-template:
name: '{name}-whitespaces'
@@ -99,7 +99,7 @@
builders:
- mw-install-sqlite
- mw-apply-settings
- - shell: "/srv/slave-scripts/bin/mw-run-phpunit.sh {phpunit-group}"
+ - shell: "/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh
{phpunit-group}"
publishers:
- phpunit-junit-2
- archive-log-dir
@@ -199,7 +199,7 @@
builders:
- mw-install-sqlite
- mw-apply-settings
- - shell: "/srv/slave-scripts/bin/mw-run-phpunit.sh"
+ - shell: "/srv/deployment/integration/slave-scripts/bin/mw-run-phpunit.sh"
publishers:
- phpunit-junit-2
- archive-log-dir
diff --git a/mobile.yaml b/mobile.yaml
index df25998..ce929fc 100644
--- a/mobile.yaml
+++ b/mobile.yaml
@@ -37,7 +37,7 @@
group-id: org.wikimedia
artifact-id: commons-parent
goals: 'clean package'
- maven-opts:
'-Dandroid.sdk.path=/srv/slave-scripts/tools/android/android-sdk-linux'
+ maven-opts:
'-Dandroid.sdk.path=/srv/deployment/integration/slave-scripts/tools/android/android-sdk-linux'
postbuilders:
# Move the apk files at the root of $WORKSPACE or copy-to-master
diff --git a/operations-puppet.yaml b/operations-puppet.yaml
index 4e0b756..c867970 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -50,7 +50,7 @@
- zuul
builders:
- - shell: "/srv/slave-scripts/bin/puppet-test-runner.sh"
+ - shell:
"/srv/deployment/integration/slave-scripts/bin/puppet-test-runner.sh"
# Run pep8 per file so that individual puppet dirs
# can specify their own .pep8 rules
@@ -66,7 +66,7 @@
# Requires Jenkins slave scripts
- shell: |
set -o pipefail
- /srv/slave-scripts/tools/puppet_pep8.py . | tee pep8.txt
+ /srv/deployment/integration/slave-scripts/tools/puppet_pep8.py . |
tee pep8.txt
set +o pipefail
publishers:
diff --git a/parsoid.yaml b/parsoid.yaml
index 60f1446..1936d60 100644
--- a/parsoid.yaml
+++ b/parsoid.yaml
@@ -122,7 +122,7 @@
triggeredCommit: "$ZUUL_COMMIT"
# Use junitdiff tool to diff the two results
- - shell: 'node /srv/slave-scripts/tools/junitdiff/junitdiff
oldresults.xml results.xml > diff.xml'
+ - shell: 'node
/srv/deployment/integration/slave-scripts/tools/junitdiff/junitdiff
oldresults.xml results.xml > diff.xml'
publishers:
- xunit:
--
To view, visit https://gerrit.wikimedia.org/r/98513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie99d44a328d157569edc3c763243a2cb4cd4b040
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
