jenkins-bot has submitted this change and it was merged.
Change subject: Simplify node definitions to only use phpflavor, not OS
......................................................................
Simplify node definitions to only use phpflavor, not OS
Change-Id: I3806a82133b3e52d396207c05040fc54faf8fc61
---
M jjb/wikidata.yaml
M jjb/wm-fundraising.yaml
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index db164ee..b5bccb9 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -24,7 +24,7 @@
- job-template:
name: 'mwext-{ext-name}-{kind}-tests-{dbflavor}-{phpflavor}'
- node: 'contintLabsSlave && ((UbuntuPrecise && phpflavor-php53 &&
phpflavor-{phpflavor}) || (UbuntuTrusty && phpflavor-hhvm &&
phpflavor-{phpflavor}))'
+ node: 'contintLabsSlave && phpflavor-{phpflavor}'
concurrent: true
triggers:
- zuul
diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml
index 44a2ebc..7e35dad 100644
--- a/jjb/wm-fundraising.yaml
+++ b/jjb/wm-fundraising.yaml
@@ -61,7 +61,7 @@
- job:
name: 'mwext-donationinterfacecore125-testextension-php53'
- node: 'contintLabsSlave && phpflavor-php53 && (UbuntuPrecise ||
UbuntuTrusty)'
+ node: 'contintLabsSlave && phpflavor-php53'
concurrent: true
properties:
- throttle-one-per-node
--
To view, visit https://gerrit.wikimedia.org/r/269895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3806a82133b3e52d396207c05040fc54faf8fc61
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
