Merge "Fix API launch"

This commit is contained in:
Jenkins 2014-03-03 21:28:44 +00:00 committed by Gerrit Code Review
commit a91c4e7d4d
2 changed files with 4 additions and 2 deletions

View File

@ -60,7 +60,7 @@ function stop_service() {
function detect_storyboard_config() {
local global_config_path='/etc/storyboard/storyboard.conf'
local test_config_path="$WORKSPACE/bin/storyboard_test.conf"
local config_path="$WORKSPACE/.tox/node/etc/storyboard/storyboard.conf"
local config_path="$WORKSPACE/.tox/grunt/etc/storyboard/storyboard.conf"
local source_config_path

View File

@ -1,6 +1,5 @@
[tox]
minversion = 1.6
envlist = node
skipsdist = True
[testenv]
@ -16,6 +15,7 @@ commands =
npm config set ca ""
npm install npm -g
npm config delete ca
pip install MySQL-python
npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
npm install
bower install
@ -26,6 +26,7 @@ commands =
npm config set ca ""
npm install npm -g
npm config delete ca
pip install MySQL-python
npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
npm install
bower install
@ -40,6 +41,7 @@ commands =
npm config set ca
npm install npm -g
npm config delete ca
pip install MySQL-python
npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11
npm install
bower install