jenkins-bot has submitted this change and it was merged.
Change subject: /var/lib/jenkins -> /srv/slave-scripts
......................................................................
/var/lib/jenkins -> /srv/slave-scripts
The slave scripts are now under /srv/slave-scripts and kept up-to-date
by puppet. So remove reference to the old path that was only on gallium.
THIS CHANGE UPDATES ALL JOBS!
bug: 53594
Change-Id: I9674b0751cbf55940aff529b6da26edf5c4a5ce0
---
M macro.yaml
M mediawiki.yaml
M mobile.yaml
M operations-puppet.yaml
M parsoid.yaml
5 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index a6fb455..1cbe975 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -6,14 +6,14 @@
name: erblint-HEAD
builders:
- shell: |
- /var/lib/jenkins/bin/git-changed-in-head erb \
+ /srv/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: |
- /var/lib/jenkins/bin/git-changed-in-head pp \
+ /srv/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
@@ -63,8 +63,8 @@
- shell: |
#!/bin/bash -xe
cd "{dir}"
- /var/lib/jenkins/bin/jshint --version
- /var/lib/jenkins/bin/jshint .
+ /srv/slave-scripts/bin/jshint --version
+ /srv/slave-scripts/bin/jshint .
- builder:
name: jshint
@@ -134,7 +134,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
- /var/lib/jenkins/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit";
+ /srv/slave-scripts/bin/wmfgrunt qunit --verbose
--qunit-url="http://localhost:9412/$TEST_ID/index.php?title=Special:JavaScriptTest/qunit";
gqec=$?
# Clean up
rm /srv/localhost/qunit/$TEST_ID
@@ -200,7 +200,7 @@
- builder:
name: mw-get-extensions
builders:
- - shell: "/var/lib/jenkins/tools/fetch-mw-ext {dependencies}"
+ - shell: "/srv/slave-scripts/tools/fetch-mw-ext {dependencies}"
- builder:
name: mw-run-update-script
@@ -295,7 +295,7 @@
name: phplint
builders:
- shell: |
- /var/lib/jenkins/bin/git-changed-in-head php php5 inc phtml \
+ /srv/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
@@ -306,7 +306,7 @@
- shell: |
phpcs -v -s . \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--extensions=php,inc \
--ignore=languages/messages/Messages*.php,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
@@ -319,7 +319,7 @@
name: phpcs-HEAD
builders:
- shell: |
- PHPCS_FILES=$(/var/lib/jenkins/bin/git-changed-in-head php php5 inc
sample)
+ PHPCS_FILES=$(/srv/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"
@@ -328,7 +328,7 @@
phpcs -v -s $PHPCS_FILES \
--encoding=utf-8 \
- --standard=/var/lib/jenkins/tools/mwcodesniffer/MediaWiki \
+ --standard=/srv/slave-scripts/tools/mwcodesniffer/MediaWiki \
--ignore=languages/messages/Messages,*.i18n.php \
--report-checkstyle=checkstyle-phpcs.xml \
--report-full
@@ -336,22 +336,22 @@
- builder:
name: phpcs-strict
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh
- builder:
name: phpcs-strict-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh HEAD
- builder:
name: phpcs-lenient
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings
- builder:
name: phpcs-lenient-HEAD
builders:
- - shell: /var/lib/jenkins/bin/run-phpcs-mw.sh nowarnings HEAD
+ - shell: /srv/slave-scripts/bin/run-phpcs-mw.sh nowarnings HEAD
- publisher:
name: phpcs
@@ -400,7 +400,7 @@
- builder:
name: yaml-lint
builders:
- - shell: '/var/lib/jenkins/tools/yamllint.py "$WORKSPACE"'
+ - shell: '/srv/slave-scripts/tools/yamllint.py "$WORKSPACE"'
- publisher:
name: archive-log-dir
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 8abab96..63b8788 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -70,7 +70,7 @@
triggers:
- zuul
builders:
- - shell: "/var/lib/jenkins/tools/mwcore-docgen.sh"
+ - shell: "/srv/slave-scripts/tools/mwcore-docgen.sh"
- job-template:
name: '{name}-whitespaces'
diff --git a/mobile.yaml b/mobile.yaml
index 630eb80..df25998 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=/var/lib/jenkins/tools/android/android-sdk-linux'
+ maven-opts:
'-Dandroid.sdk.path=/srv/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 20f426b..4cbe4ec 100644
--- a/operations-puppet.yaml
+++ b/operations-puppet.yaml
@@ -50,7 +50,7 @@
- zuul
builders:
- - shell: "/var/lib/jenkins/bin/puppet-test-runner.sh"
+ - shell: "/srv/slave-scripts/bin/puppet-test-runner.sh"
# Run pep8 per file so that individual puppet dirs
# can specify their own .pep8 rules
diff --git a/parsoid.yaml b/parsoid.yaml
index 54830c1..0e1cb7a 100644
--- a/parsoid.yaml
+++ b/parsoid.yaml
@@ -122,7 +122,7 @@
triggeredCommit: "$ZUUL_COMMIT"
# Use junitdiff tool to diff the two results
- - shell: 'node /var/lib/jenkins/tools/junitdiff/junitdiff
oldresults.xml results.xml > diff.xml'
+ - shell: 'node /srv/slave-scripts/tools/junitdiff/junitdiff
oldresults.xml results.xml > diff.xml'
publishers:
- xunit:
--
To view, visit https://gerrit.wikimedia.org/r/92626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9674b0751cbf55940aff529b6da26edf5c4a5ce0
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
