@@ -30,8 +30,7 @@ DIR=$(dirname $0)
30
30
31
31
get_distro
32
32
get_mongodb_download_url_for " $DISTRO " " $MONGODB_VERSION "
33
- DRIVERS_TOOLS=./ download_and_extract " $MONGODB_DOWNLOAD_URL " " $EXTRACT "
34
-
33
+ DRIVERS_TOOLS=./ download_and_extract " $MONGODB_DOWNLOAD_URL " " $EXTRACT " " $MONGOSH_DOWNLOAD_URL " " $EXTRACT_MONGOSH "
35
34
36
35
OS=$( uname -s | tr ' [:upper:]' ' [:lower:]' )
37
36
@@ -115,7 +114,6 @@ case "$OS" in
115
114
cd mongo-orchestration
116
115
python -m pip install .
117
116
cd ../..
118
- ls ` pwd` /mongodb/bin/mongo* || true
119
117
nohup mongo-orchestration -f orchestration.config -e default --socket-timeout-ms=60000 --bind=127.0.0.1 --enable-majority-read-concern -s wsgiref start > $MONGO_ORCHESTRATION_HOME /out.log 2> $MONGO_ORCHESTRATION_HOME /err.log < /dev/null &
120
118
;;
121
119
* )
@@ -162,7 +160,7 @@ python -m json.tool curl_mo.txt
162
160
sleep 15
163
161
164
162
if [ " $AUTH " = " auth" ]; then
165
- MONGO_SHELL_CONNECTION_FLAGS=" -ubob -ppwd123 "
163
+ MONGO_SHELL_CONNECTION_FLAGS=" --username bob --password pwd123 "
166
164
fi
167
165
168
166
if [ -n " $AUTHSOURCE " ]; then
178
176
if [ ! -z " $REQUIRE_API_VERSION " ]; then
179
177
MONGO_SHELL_CONNECTION_FLAGS=" ${MONGO_SHELL_CONNECTION_FLAGS} --apiVersion=1"
180
178
# Set the requireApiVersion parameter.
181
- ` pwd ` /mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS $DIR /../etc/require-api-version.js
179
+ . /mongodb/bin/mongosh $MONGO_SHELL_CONNECTION_FLAGS $DIR /../etc/require-api-version.js
182
180
fi
183
181
184
182
echo $MONGO_SHELL_CONNECTION_FLAGS
185
183
186
- ` pwd` /mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval ' printjson(db.serverBuildInfo())' admin
187
- ` pwd` /mongodb/bin/mongo $MONGO_SHELL_CONNECTION_FLAGS --eval ' printjson(db.isMaster())' admin
188
-
189
184
# Create mo-expansion.yml. expansions.update expects the file to exist.
190
185
touch mo-expansion.yml
191
186
199
194
echo " CRYPT_SHARED_LIB_PATH must be assigned, but wasn't" 1>&2 # write to stderr"
200
195
exit 1
201
196
fi
202
- cat >> mo-expansion.yml << EOT
197
+ cat >> mo-expansion.yml << EOT
203
198
CRYPT_SHARED_LIB_PATH: "$CRYPT_SHARED_LIB_PATH "
204
199
EOT
205
200
0 commit comments