jenkins-bot has submitted this change and it was merged.
Change subject: drop labels hasPhpUnit & hasPhpcs (unneeded now)
......................................................................
drop labels hasPhpUnit & hasPhpcs (unneeded now)
The two slaves gallium and lanthanum nowadays have PHPUnit and PHP
Codesniffer. They are both deployed from git repositories using
Wikimedia deployment system.
Change-Id: I8894465b2c1291687d1be9073f7d460265b7a67a
---
M job-templates.yaml
M mediawiki-extensions.yaml
M mediawiki.yaml
M operations-mw-config.yaml
4 files changed, 12 insertions(+), 13 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/job-templates.yaml b/job-templates.yaml
index 5d57275..bb8fd71 100644
--- a/job-templates.yaml
+++ b/job-templates.yaml
@@ -74,7 +74,7 @@
# PHP CodeSniffer on everything under the workspace
- job-template:
name: '{name}-phpcs'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -92,7 +92,7 @@
# PHP CodeSniffer on changed files
- job-template:
name: '{name}-phpcs-HEAD'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -109,7 +109,7 @@
- job-template:
name: '{name}-phpcs-strict'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -126,7 +126,7 @@
- job-template:
name: '{name}-phpcs-strict-HEAD'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -143,7 +143,7 @@
- job-template:
name: '{name}-phpcs-lenient'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -160,7 +160,7 @@
- job-template:
name: '{name}-phpcs-lenient-HEAD'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul-no-submodules
triggers:
- zuul
@@ -177,7 +177,7 @@
- job-template:
name: '{name}-phpunit'
- node: hasPhpUnit
+ node: hasSlaveScripts
defaults: use-remote-zuul
triggers:
- zuul
diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml
index 51d9663..cec9ff1 100644
--- a/mediawiki-extensions.yaml
+++ b/mediawiki-extensions.yaml
@@ -110,7 +110,7 @@
- job-template:
name: '{name}-{ext-name}-phpcs-HEAD'
- node: (hasSlaveScripts && hasPhpcs)
+ node: hasSlaveScripts
defaults: use-remote-zuul
triggers:
- zuul
@@ -152,7 +152,7 @@
# Run all extension tests
- job-template:
name: '{name}-{ext-name}-testextensions-{mwbranch}'
- node: (hasSlaveScripts && hasPhpUnit)
+ node: hasSlaveScripts
defaults: use-zuul-for-mw-ext
triggers:
- zuul
@@ -218,7 +218,7 @@
# and server configurations.
- job-template:
name: 'mwext-Wikibase-{kind}-tests'
- node: (hasSlaveScripts && hasPhpUnit)
+ node: hasSlaveScripts
defaults: use-zuul-for-mw-ext
ext-name: 'Wikibase'
triggers:
diff --git a/mediawiki.yaml b/mediawiki.yaml
index 106490b..e85a17d 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -89,7 +89,7 @@
# @param phpunit-group suffix for an ant target 'phpunit-{phpunit-group}
- job-template:
name: '{name}-phpunit-{phpunit-group}'
- node: (hasSlaveScripts && hasPhpUnit)
+ node: hasSlaveScripts
defaults: use-remote-zuul
scm:
- git-mwcore
@@ -189,7 +189,7 @@
- job-template:
name: 'mediawiki-core-regression-{branch}'
- node: (hasSlaveScripts && hasPhpUnit)
+ node: hasSlaveScripts
defaults: use-zuul
scm:
- git-mwcore
diff --git a/operations-mw-config.yaml b/operations-mw-config.yaml
index 2290d89..96e9a50 100644
--- a/operations-mw-config.yaml
+++ b/operations-mw-config.yaml
@@ -3,7 +3,6 @@
# Repo has a reference to a git://github.com url which does not
# work on 10.0.0.0/8 slaves :(
#
-# node: (hasContintPackages && hasPhpUnit)
node: gallium
defaults: use-remote-zuul
triggers:
--
To view, visit https://gerrit.wikimedia.org/r/99712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8894465b2c1291687d1be9073f7d460265b7a67a
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
