Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296061
Change subject: Move script out of assert-phpflavor macro
......................................................................
Move script out of assert-phpflavor macro
Ive moved it into integration/jenkins with this patch
I8cfeabdfe3f786b6ae31168ca0497fbed7e0cb4f
Bug: T124572
Change-Id: I21fa4d2fb0a0ebd5dd6f6495458b096e2c910f81
---
M jjb/macro.yaml
1 file changed, 4 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/61/296061/1
diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index cb0f892..20433eb 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -203,46 +203,15 @@
# Assert 'php' is phpflavor
#
# Parameter:
-# * phpflavor: 'hhvm' or 'zend' or 'php53'
+# * phpflavor: 'hhvm' or 'zend' or 'php53' or 'php55'
+#
+# The script is located in integration/jenkins repo now.
#
- builder:
name: assert-phpflavor
builders:
- shell: |
- #!/bin/bash -eu
- PHP_VERSION=`php --version`
-
- case "{phpflavor}" in
- ( 'hhvm' )
- MATCHER='^HipHop'
- ;;
- ( 'zend' )
- MATCHER='^Zend Engine'
- ;;
- ( 'php53' )
- MATCHER='^PHP 5\.3'
- ;;
- ( 'php55' )
- MATCHER='^PHP 5\.5'
- PHP_VERSION=`php5 --version`
- ;;
- ( 'php56' )
- MATCHER='^PHP 5\.6'
- PHP_VERSION=`php5 --version`
- ;;
- ( * )
- echo "Invalid phpflavor '{phpflavor}' for JJB macro
'assert-phpflavor'"
- echo "Must be either 'hhvm' or 'zend'"
- exit 1
- ;;
- esac
-
- if ( echo "$PHP_VERSION" | egrep "$MATCHER" > /dev/null ); then
- echo -e "php is {phpflavor}:\n\n$PHP_VERSION\n"
- else
- echo -e "Assertion error: php is not
{phpflavor}:\n\n$PHP_VERSION\n"
- exit 1
- fi
+ . /srv/deployment/integration/slave-scripts/bin/npm-setup.sh
- builder:
name: 'hhvm-clear-hhbc'
--
To view, visit https://gerrit.wikimedia.org/r/296061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21fa4d2fb0a0ebd5dd6f6495458b096e2c910f81
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
