Skip to content

Commit 223426f

Browse files
authored
CDRIVER-6065 remove atlas data lake testing (#2117)
1 parent 04771de commit 223426f

File tree

17 files changed

+3
-742
lines changed

17 files changed

+3
-742
lines changed

.evergreen/generated_configs/legacy-config.yml

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -211,59 +211,6 @@ functions:
211211
script: |-
212212
set -o errexit
213213
COVERAGE=ON .evergreen/scripts/compile.sh
214-
build mongohouse:
215-
- command: ec2.assume_role
216-
params:
217-
role_arn: ${aws_test_secrets_role}
218-
- command: shell.exec
219-
type: test
220-
params:
221-
include_expansions_in_env:
222-
- AWS_ACCESS_KEY_ID
223-
- AWS_SECRET_ACCESS_KEY
224-
- AWS_SESSION_TOKEN
225-
shell: bash
226-
script: |-
227-
set -o errexit
228-
cd drivers-evergreen-tools
229-
export DRIVERS_TOOLS=$(pwd)
230-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
231-
run mongohouse:
232-
- command: shell.exec
233-
type: test
234-
params:
235-
shell: bash
236-
script: |-
237-
set -o errexit
238-
cd drivers-evergreen-tools
239-
export DRIVERS_TOOLS=$(pwd)
240-
.evergreen/atlas_data_lake/run-mongohouse-image.sh
241-
test mongohouse:
242-
- command: shell.exec
243-
type: test
244-
params:
245-
working_dir: mongoc
246-
shell: bash
247-
script: |-
248-
set -o errexit
249-
echo "Waiting for mongohouse to start..."
250-
wait_for_mongohouse() {
251-
for _ in $(seq 300); do
252-
# Exit code 7: "Failed to connect to host".
253-
if curl -s localhost:$1; (("$?" != 7)); then
254-
return 0
255-
else
256-
sleep 1
257-
fi
258-
done
259-
echo "Could not detect mongohouse on port $1" 1>&2
260-
return 1
261-
}
262-
wait_for_mongohouse 27017 || exit
263-
echo "Waiting for mongohouse to start... done."
264-
pgrep -a "mongohouse"
265-
export RUN_MONGOHOUSE_TESTS=ON
266-
./cmake-build/src/libmongoc/test-libmongoc --no-fork -l /mongohouse/* -d --skip-tests .evergreen/etc/skip-tests.txt
267214
run aws tests:
268215
- command: ec2.assume_role
269216
params:
@@ -1119,17 +1066,6 @@ tasks:
11191066
vars:
11201067
BUILD_NAME: debug-compile-nosasl-openssl
11211068
- func: run auth tests
1122-
- name: test-mongohouse
1123-
depends_on:
1124-
name: debug-compile-sasl-openssl
1125-
commands:
1126-
- func: fetch-build
1127-
vars:
1128-
BUILD_NAME: debug-compile-sasl-openssl
1129-
- func: fetch-det
1130-
- func: build mongohouse
1131-
- func: run mongohouse
1132-
- func: test mongohouse
11331069
- name: authentication-tests-asan-memcheck
11341070
tags:
11351071
- asan
@@ -10340,12 +10276,6 @@ buildvariants:
1034010276
- .test-aws .7.0
1034110277
- .test-aws .8.0
1034210278
- .test-aws .latest
10343-
- name: mongohouse
10344-
display_name: Mongohouse Test
10345-
run_on: ubuntu2204-small
10346-
tasks:
10347-
- debug-compile-sasl-openssl
10348-
- test-mongohouse
1034910279
- name: ocsp
1035010280
display_name: OCSP tests
1035110281
run_on: ubuntu2004-small

.evergreen/legacy_config_generator/evergreen_config_lib/functions.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -155,50 +155,6 @@
155155
COVERAGE=ON .evergreen/scripts/compile.sh
156156
''', add_expansions_to_env=True),
157157
)),
158-
('build mongohouse', Function(
159-
# Assume role to get AWS secrets.
160-
{
161-
"command": "ec2.assume_role",
162-
"params": {
163-
"role_arn": "${aws_test_secrets_role}"
164-
}
165-
},
166-
167-
shell_exec(r'''
168-
cd drivers-evergreen-tools
169-
export DRIVERS_TOOLS=$(pwd)
170-
.evergreen/atlas_data_lake/pull-mongohouse-image.sh
171-
''', include_expansions_in_env=[ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]),
172-
)),
173-
('run mongohouse', Function(
174-
shell_exec(r'''
175-
cd drivers-evergreen-tools
176-
export DRIVERS_TOOLS=$(pwd)
177-
.evergreen/atlas_data_lake/run-mongohouse-image.sh
178-
'''),
179-
)),
180-
('test mongohouse', Function(
181-
shell_mongoc(r'''
182-
echo "Waiting for mongohouse to start..."
183-
wait_for_mongohouse() {
184-
for _ in $(seq 300); do
185-
# Exit code 7: "Failed to connect to host".
186-
if curl -s localhost:$1; (("$?" != 7)); then
187-
return 0
188-
else
189-
sleep 1
190-
fi
191-
done
192-
echo "Could not detect mongohouse on port $1" 1>&2
193-
return 1
194-
}
195-
wait_for_mongohouse 27017 || exit
196-
echo "Waiting for mongohouse to start... done."
197-
pgrep -a "mongohouse"
198-
export RUN_MONGOHOUSE_TESTS=ON
199-
./cmake-build/src/libmongoc/test-libmongoc --no-fork -l /mongohouse/* -d --skip-tests .evergreen/etc/skip-tests.txt
200-
'''),
201-
)),
202158
('run aws tests', Function(
203159
# Assume role to get AWS secrets.
204160
{

.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -562,12 +562,6 @@ def pre_commands(self) -> Iterable[Value]:
562562
all_tasks = chain(
563563
all_tasks,
564564
[
565-
PostCompileTask(
566-
"test-mongohouse",
567-
tags=[],
568-
get_build="debug-compile-sasl-openssl",
569-
commands=[func("fetch-det"), func("build mongohouse"), func("run mongohouse"), func("test mongohouse")],
570-
),
571565
NamedTask(
572566
"authentication-tests-asan-memcheck",
573567
tags=["authentication-tests", "asan"],

.evergreen/legacy_config_generator/evergreen_config_lib/variants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ def days(n: int) -> int:
296296
],
297297
{"CC": "clang"},
298298
),
299-
Variant("mongohouse", "Mongohouse Test", "ubuntu2204-small", ["debug-compile-sasl-openssl", "test-mongohouse"], {}),
300299
Variant(
301300
"ocsp",
302301
"OCSP tests",

src/libmongoc/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,6 @@ set (test-libmongoc-sources
10901090
${PROJECT_SOURCE_DIR}/tests/test-mongoc-log.c
10911091
${PROJECT_SOURCE_DIR}/tests/test-mongoc-long-namespace.c
10921092
${PROJECT_SOURCE_DIR}/tests/test-mongoc-max-staleness.c
1093-
${PROJECT_SOURCE_DIR}/tests/test-mongoc-mongohouse.c
10941093
${PROJECT_SOURCE_DIR}/tests/test-mongoc-mongos-pinning.c
10951094
${PROJECT_SOURCE_DIR}/tests/test-mongoc-oidc-callback.c
10961095
${PROJECT_SOURCE_DIR}/tests/test-mongoc-opts.c

src/libmongoc/tests/json-test.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,11 +1262,6 @@ deactivate_fail_points(mongoc_client_t *client, uint32_t server_id)
12621262

12631263
ASSERT(client);
12641264

1265-
if (test_framework_is_mongohouse()) {
1266-
// mongohouse does not support failpoints.
1267-
return;
1268-
}
1269-
12701265
if (server_id) {
12711266
sd = mongoc_client_get_server_description(client, server_id);
12721267
BSON_ASSERT(sd);
@@ -1771,11 +1766,9 @@ run_json_general_test(const json_test_config_t *config)
17711766

17721767
set_auto_encryption_opts(client, &test);
17731768
/* Drop and recreate test database/collection if necessary. */
1774-
if (!test_framework_is_mongohouse()) {
1775-
// mongohouse test user is not authorized to run `drop`.
1776-
_recreate(db_name, collection_name, scenario);
1777-
_recreate(db2_name, collection2_name, scenario);
1778-
}
1769+
_recreate(db_name, collection_name, scenario);
1770+
_recreate(db2_name, collection2_name, scenario);
1771+
17791772
insert_data(db_name, collection_name, scenario);
17801773

17811774
db = mongoc_client_get_database(client, db_name);

src/libmongoc/tests/json/mongohouse/aggregate.json

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/libmongoc/tests/json/mongohouse/estimatedDocumentCount.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/libmongoc/tests/json/mongohouse/find.json

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)