Skip to content

Commit 0fe79dc

Browse files
committed
always use latest Mongo Orchestration
1 parent 9599445 commit 0fe79dc

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.evergreen/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ functions:
4141
script: |
4242
set -o xtrace
4343
rm -f *.tar.gz
44-
curl http://s3.amazonaws.com/mciuploads/mongo-c-driver/mongo-c-driver-${CURRENT_VERSION}.tar.gz --output mongoc.tar.gz --silent --max-time 120
45-
pip install --upgrade git+git://github.com/mongodb/mongo-orchestration@master
44+
curl http://s3.amazonaws.com/mciuploads/mongo-c-driver/${branch_name}/mongo-c-driver-${CURRENT_VERSION}.tar.gz --output mongoc.tar.gz --silent --max-time 120
4645
4746
"upload release":
4847
- command: shell.exec

.evergreen/integration-tests.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ case "$OS" in
6060
cp -r mongodb /cygdrive/c/mongodb
6161
echo "{ \"releases\": { \"default\": \"c:\\\\mongodb\\\\bin\" }}" > orchestration.config
6262

63-
# Crazy python stuff to make sure MO is running latest version
63+
# Make sure MO is running latest version
6464
python.exe -m virtualenv venv
6565
cd venv
6666
. Scripts/activate
@@ -76,6 +76,14 @@ case "$OS" in
7676
;;
7777
*)
7878
echo "{ \"releases\": { \"default\": \"`pwd`/mongodb/bin\" } }" > orchestration.config
79+
# Make sure MO is running latest version
80+
python -m virtualenv venv
81+
cd venv
82+
. bin/activate
83+
git clone https://github.com/10gen/mongo-orchestration.git
84+
cd mongo-orchestration
85+
pip install .
86+
cd ../..
7987
nohup mongo-orchestration -f orchestration.config -e default --socket-timeout-ms=60000 --bind=127.0.0.1 --enable-majority-read-concern start > $MONGO_ORCHESTRATION_HOME/out.log 2> $MONGO_ORCHESTRATION_HOME/err.log < /dev/null &
8088
if [ "$SSL" != "nossl" ]; then
8189
export MONGO_SHELL_CONNECTION_FLAGS="$MONGO_SHELL_CONNECTION_FLAGS --host localhost --ssl --sslCAFile=$MONGO_ORCHESTRATION_HOME/lib/ca.pem --sslPEMKeyFile=$MONGO_ORCHESTRATION_HOME/lib/client.pem"

0 commit comments

Comments
 (0)