opendev/storyboard-webclient
Code Issues Proposed changes

Merge "Fix API launch"

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/api.sh
View File

@ -60,7 +60,7 @@ function stop_service() {
function detect_storyboard_config() { function detect_storyboard_config() {
local global_config_path='/etc/storyboard/storyboard.conf' local global_config_path='/etc/storyboard/storyboard.conf'
local test_config_path="$WORKSPACE/bin/storyboard_test.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 local source_config_path

4
tox.ini
View File

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