@@ -152,10 +152,19 @@ cxx_driver_variables:
152152 echo "{ \"releases\": { \"default\": \"c:\\\\mongodb\\\\bin\" }, \"last_updated\": \"2014-08-29 20:57:00.000000\" }" > orchestration.config
153153 mongo-orchestration -f orchestration.config -e default -s wsgiref start
154154 linux : &mongo_orchestration_linux
155- # # mongo orchestration is included on linux, no installation needed
155+ # # we are going to manually install mongo- orchestration for now on Linux until it is stable enough that we don't always to install from HEAD
156156 start_mongo_orchestration : |
157- echo "Starting Mongo Orchestration..."
157+ echo "Installing Mongo Orchestration..."
158158 trap 'set +o errexit; mongo-orchestration stop;' EXIT
159+ git clone https://github.com/10gen/mongo-orchestration.git
160+ cd mongo-orchestration
161+ if [ "$(whoami)" != "root" ]; then
162+ sudo python setup.py install
163+ else
164+ python setup.py install
165+ fi
166+ cd ..
167+ echo "Starting Mongo Orchestration..."
159168 echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" }, \"last_updated\": \"2014-08-29 20:57:00.000000\" }" > orchestration.config
160169 TMPDIR=/data/db mongo-orchestration -f orchestration.config -e default start
161170 osx : &mongo_orchestration_osx
@@ -226,21 +235,21 @@ functions:
226235 params :
227236 updates :
228237 - key : " mongo_url"
229- value : ${mongo_url_prefix}${mongo_url_enterprise_keyword|enterprise}- ${mongo_url_platform|}2.6.5.${mongo_url_extension|tgz}
238+ value : ${mongo_url_prefix}${mongo_url_enterprise_keyword|enterprise-} ${mongo_url_platform|}2.6.5.${mongo_url_extension|tgz}
230239
231240 " set version 2.4" :
232241 command : expansions.update
233242 params :
234243 updates :
235244 - key : " mongo_url"
236- value : ${mongo_url_prefix}${mongo_url_subscription_keyword|subscription}- ${mongo_url_platform|}2.4.12.${mongo_url_extension|tgz}
245+ value : ${mongo_url_prefix}${mongo_url_subscription_keyword|subscription-} ${mongo_url_platform|}2.4.12.${mongo_url_extension|tgz}
237246
238247 " set version 2.2" :
239248 command : expansions.update
240249 params :
241250 updates :
242251 - key : " mongo_url"
243- value : ${mongo_url_prefix}${mongo_url_subscription_keyword|subscription}- ${mongo_url_platform|}2.2.7.${mongo_url_extension|tgz}
252+ value : ${mongo_url_prefix}${mongo_url_subscription_keyword|subscription-} ${mongo_url_platform|}2.2.7.${mongo_url_extension|tgz}
244253
245254 " run integration tests" :
246255 command : shell.exec
0 commit comments