Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351701 )
Change subject: Revert "Add set-phpflavor macro"
......................................................................
Revert "Add set-phpflavor macro"
Each shell stanza stats with a fresh shell environment. Hence one can
not set a variable in a shell and expect it to still be set in the next
shell.
This reverts commit d1901366f0dce7656ee85207c559b584e365abaa.
Bug: T157750
Change-Id: I0b0dc5e4a7b02967d7c5cba8bec6149912679b57
---
M jjb/macro.yaml
M jjb/mediawiki-tools.yaml
M zuul/parameter_functions.py
3 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/01/351701/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 65715f6..4cb8be7 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -160,14 +160,6 @@
exit 1
fi
-- builder:
- name: set-phpflavor
- builders:
- - shell: |
- export PHP_BIN={phpflavor}
- - assert-phpflavor:
- phpflavor: '{phpflavor}'
-
# Assert 'php' is phpflavor
#
# Parameter:
diff --git a/jjb/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
index a4a64ab..11a9f82 100644
--- a/jjb/mediawiki-tools.yaml
+++ b/jjb/mediawiki-tools.yaml
@@ -47,8 +47,6 @@
triggers:
- zuul
builders:
- - set-phpflavor:
- phpflavor: hhvm
- castor-load
- zuul-cloner:
projects: >
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 4312a57..affd469 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -21,6 +21,7 @@
'mw-testskin',
'mw-testskin-non-voting',
'mediawiki-core-phpcs-trusty',
+ 'mw-tools-codesniffer-mwcore-testrun',
)
php5_jobs = (
# Qunit localhost uses apache mod_php which is Zend. Lets be consistent
--
To view, visit https://gerrit.wikimedia.org/r/351701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b0dc5e4a7b02967d7c5cba8bec6149912679b57
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
