Test FLX sync geospatial queries #7042
+163
−96
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,9 +17,9 @@ case $(uname -s) in | |
| Darwin) | ||
| if [[ "$(uname -m)" == "arm64" ]]; then | ||
| export GOARCH=arm64 | ||
| STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/macos-arm64/stitch-support-6.1.0-alpha-527-g796351f.tgz" | ||
| STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_6513254ad6d80abfffa5fbdc_23_09_26_18_39_06/assisted_agg" | ||
| GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.darwin-arm64.tar.gz" | ||
| MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/osx/mongodb-macos-arm64-enterprise-6.0.0-rc13.tgz" | ||
| MONGOSH_DOWNLOAD_URL="https://downloads.mongodb.com/compass/mongosh-1.5.0-darwin-arm64.zip" | ||
|
|
||
|
|
@@ -34,21 +34,28 @@ case $(uname -s) in | |
| export GOMAXPROCS | ||
| else | ||
| export GOARCH=amd64 | ||
| STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/macos-arm64/stitch-support-4.4.17-rc1-2-g85de0cc.tgz" | ||
| STITCH_ASSISTED_AGG_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_osx_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_6513254ad6d80abfffa5fbdc_23_09_26_18_39_06/assisted_agg" | ||
| GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.darwin-amd64.tar.gz" | ||
| MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/osx/mongodb-macos-x86_64-enterprise-5.0.3.tgz" | ||
| fi | ||
|
|
||
| NODE_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/node-v14.17.0-darwin-x64.tar.gz" | ||
| JQ_DOWNLOAD_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/jq-1.6-darwin-amd64" | ||
| ;; | ||
| Linux) | ||
| GO_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/go1.21.1.linux-amd64.tar.gz" | ||
| JQ_DOWNLOAD_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/jq-1.6-linux-amd64" | ||
| NODE_URL="https://s3.amazonaws.com/static.realm.io/evergreen-assets/node-v14.17.0-linux-x64.tar.gz" | ||
|
|
||
| # Only x86_64 Linux machines are supported | ||
| linux_arch="$(uname -m)" | ||
| if [[ "${linux_arch}" != "x86_64" ]]; then | ||
| echo "Error: only x86_64 Linux machines are supported: ${linux_arch}" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Detect what distro/version of Linux we are running on to determine the right version of MongoDB to download | ||
| # /etc/os-release covers debian/ubuntu/suse | ||
| if [[ -e /etc/os-release ]]; then | ||
| # Amazon Linux 2 comes back as 'amzn' | ||
|
|
@@ -64,49 +71,49 @@ case $(uname -s) in | |
| case $DISTRO_NAME in | ||
| ubuntu | linuxmint) | ||
| MONGODB_DOWNLOAD_URL="http://downloads.10gen.com/linux/mongodb-linux-$(uname -m)-enterprise-ubuntu${DISTRO_VERSION_MAJOR}04-5.0.3.tgz" | ||
| STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_ubuntu2004_x86_64_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_65135b432fbabe741bd24429_23_09_26_22_29_24/libmongo-ubuntu2004-x86_64.so" | ||
| STITCH_SUPPORT_LIB_URL="https://s3.amazonaws.com/static.realm.io/stitch-support/stitch-support-ubuntu2004-4.4.17-rc1-2-g85de0cc.tgz" | ||
| ;; | ||
| rhel) | ||
| case ${DISTRO_VERSION_MAJOR} in | ||
| 7) | ||
| MONGODB_DOWNLOAD_URL="https://downloads.mongodb.com/linux/mongodb-linux-x86_64-enterprise-rhel70-5.0.3.tgz" | ||
| STITCH_ASSISTED_AGG_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-mongo-libs/stitch_mongo_libs_linux_64_patch_1e7861d9b7462f01ea220fad334f10e00f0f3cca_65135b432fbabe741bd24429_23_09_26_22_29_24/libmongo.so" | ||
| STITCH_SUPPORT_LIB_URL="https://stitch-artifacts.s3.amazonaws.com/stitch-support/linux-x64/stitch-support-4.4.17-rc1-2-g85de0cc.tgz" | ||
| ;; | ||
| *) | ||
| echo "Error: unsupported version of RHEL ${DISTRO_VERSION}" | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| ;; | ||
| *) | ||
| if [[ -z "${MONGODB_DOWNLOAD_URL}" ]]; then | ||
| echo "Error: missing MONGODB_DOWNLOAD_URL env variable to download mongodb from." | ||
| exit 1 | ||
| fi | ||
| if [[ -z "${STITCH_ASSISTED_AGG_LIB_PATH}" ]]; then | ||
| echo "Error: missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so" | ||
| exit 1 | ||
| fi | ||
| if [[ -z "${STITCH_SUPPORT_LIB_PATH}" ]]; then | ||
| echo "Error: missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library" | ||
| exit 1 | ||
| fi | ||
| ;; | ||
| esac | ||
| ;; | ||
| *) | ||
| if [[ -z "${MONGODB_DOWNLOAD_URL}" ]]; then | ||
| echo "Error: missing MONGODB_DOWNLOAD_URL env variable to download mongodb from." | ||
| exit 1 | ||
| fi | ||
| if [[ -z "${STITCH_ASSISTED_AGG_LIB_PATH}" ]]; then | ||
| echo "Error: missing STITCH_ASSISTED_AGG_LIB_PATH env variable to find assisted agg libmongo.so" | ||
| exit 1 | ||
| fi | ||
| if [[ -z "${STITCH_SUPPORT_LIB_PATH}" ]]; then | ||
| echo "Error: missing STITCH_SUPPORT_LIB_PATH env variable to find the mongo stitch support library" | ||
| exit 1 | ||
| fi | ||
| exit 1 | ||
|
|
@@ -453,8 +460,9 @@ echo "Adding fake appid to skip baas server drop optimization" | |
| # Start the baas server on port *:9090 with the provided config JSON files | ||
| echo "Starting baas app server" | ||
|
|
||
| # see config overrides at https://github.com/10gen/baas/blob/master/etc/configs/test_rcore_config.json | ||
| "${WORK_PATH}/baas_server" \ | ||
| --configFile=etc/configs/test_config.json --configFile=etc/configs/test_rcore_config.json > "${BAAS_SERVER_LOG}" 2>&1 & | ||
| echo $! > "${BAAS_PID_FILE}" | ||
|
|
||
| WAIT_BAAS_OPTS=() | ||
|
|
@@ -472,7 +480,7 @@ ${CURL} 'http://localhost:9090/api/admin/v3.0/auth/providers/local-userpass/logi | |
| --silent \ | ||
| --fail \ | ||
| --output /dev/null \ | ||
| --data '{"username":"[email protected]","password":"password"}' | ||
|
|
||
| "${MONGO_BINARIES_DIR}/bin/${MONGOSH}" --quiet mongodb://localhost:26000/auth "${BASE_PATH}/add_admin_roles.js" | ||
|
|
||
|
|
@@ -483,4 +491,4 @@ echo "---------------------------------------------" | |
| echo "Baas server ready" | ||
| echo "---------------------------------------------" | ||
| wait | ||
| popd > /dev/null # baas | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tyler requested that the BAAS team maintain the config overrides for our tests so that they can keep them up to date with server features. I've removed our local overrides file
evergreen/config_overrides.jsonand now this points to a config in their repo https://github.com/10gen/baas/blob/master/etc/configs/test_rcore_config.jsonThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice! I will eventually move our dependency definitions (e.g.
STITCH_SUPPORT_LIB_URL) to use the baas definitions as well, but they need to add the definitions for Ubuntu before this happens.