habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed creation of the branch suffix

Browse Source
This commit is contained in:
Spencer Alger
2014-01-15 15:32:58 -07:00
parent fb4638ecc8
commit 52df63f326
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ci.sh
View File

@ -56,9 +56,7 @@ fi
if [[ "$NODE_UNIT" != "0" ]]; then if [[ "$NODE_UNIT" != "0" ]]; then
group "start:unit_tests" group "start:unit_tests"
if [[ -n "$JENKINS" ]]; then if [[ -n "$JENKINS" ]]; then
MOCHA_EXE="./node_modules/.bin/mocha test/unit/test_*.js --reporter ../../../test/utils/jenkins-reporter.js" call "./node_modules/.bin/mocha test/unit/test_*.js --reporter ../../../test/utils/jenkins-reporter.js 2> test/junit-node-unit.xml"
echo "\$ $MOCHA_EXE"
$MOCHA_EXE 2> test/junit-node-unit.xml
else else
grunt_ jshint mochacov:unit grunt_ jshint mochacov:unit
fi fi
@ -76,7 +74,7 @@ if [[ "$NODE_INTEGRATION" != "0" ]]; then
if [[ $TESTING_BRANCH = 'master' ]]; then if [[ $TESTING_BRANCH = 'master' ]]; then
BRANCH_SUFFIX='' BRANCH_SUFFIX=''
else else
BRANCH_SUFFIX=${TESTING_BRANCH//./_} BRANCH_SUFFIX="_${TESTING_BRANCH//./_}"
fi fi
# find value of ES_PORT # find value of ES_PORT
@ -87,13 +85,11 @@ if [[ "$NODE_INTEGRATION" != "0" ]]; then
ES_PORT=9200 ES_PORT=9200
fi fi
MOCHA_EXE="./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \ call "./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js
--host localhost \ --host localhost
--port $ES_PORT \ --port $ES_PORT
--reporter ../../../test/utils/jenkins-reporter.js" --reporter ../../../test/utils/jenkins-reporter.js
echo "\$ $MOCHA_EXE" 2> test/junit-node-integration.xml"
$MOCHA_EXE 2> test/junit-node-integration.xml
else else
manage_es start $TESTING_BRANCH $ES_RELEASE manage_es start $TESTING_BRANCH $ES_RELEASE
grunt_ mochacov:integration_$TESTING_BRANCH grunt_ mochacov:integration_$TESTING_BRANCH