diff --git a/buildscripts/evergreen_gen_streams_build_and_push_task.py b/buildscripts/evergreen_gen_streams_build_and_push_task.py index 186e45d871d..a14ef004a3e 100644 --- a/buildscripts/evergreen_gen_streams_build_and_push_task.py +++ b/buildscripts/evergreen_gen_streams_build_and_push_task.py @@ -77,7 +77,7 @@ def main( expansions = read_config_file(expansions_file) version_id = expansions.get("version_id") build_variant_name = expansions.get("build_variant") - required_tasks = {"streams", "streams_kafka", "streams_aspio"} + required_tasks = {"streams", "streams_kafka"} evg_version = evg_api.version_by_id(version_id) variant = evg_version.build_by_variant(build_variant_name) task_deps = [] diff --git a/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_0.yml b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_0.yml new file mode 100644 index 00000000000..e32fc342892 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_0.yml @@ -0,0 +1,18 @@ +test_kind: js_test + +selector: + roots: + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_changestream.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_changestream2.js + +executor: + fixture: + class: ReplicaSetFixture + mongod_options: + bind_ip_all: "" + set_parameters: + enableTestCommands: 1 + featureFlagStreams: true + diagnosticDataCollectionEnabled: false + num_nodes: 1 diff --git a/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_1.yml b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_1.yml new file mode 100644 index 00000000000..797430a1a9f --- /dev/null +++ b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_1.yml @@ -0,0 +1,19 @@ +test_kind: js_test + +selector: + roots: + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity_column_1.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity_column_2.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity_table_name.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_tpcc_orders.js + +executor: + fixture: + class: ReplicaSetFixture + mongod_options: + bind_ip_all: "" + set_parameters: + enableTestCommands: 1 + featureFlagStreams: true + diagnosticDataCollectionEnabled: false + num_nodes: 1 diff --git a/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_2.yml b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_2.yml new file mode 100644 index 00000000000..87a384ca392 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_2.yml @@ -0,0 +1,19 @@ +test_kind: js_test + +selector: + roots: + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity_db_name.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_validity_id_field_name.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_randomops.js + +executor: + fixture: + class: ReplicaSetFixture + mongod_options: + bind_ip_all: "" + set_parameters: + enableTestCommands: 1 + featureFlagStreams: true + diagnosticDataCollectionEnabled: false + num_nodes: 1 diff --git a/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_3.yml b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_3.yml new file mode 100644 index 00000000000..ddb7db37dff --- /dev/null +++ b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_3.yml @@ -0,0 +1,18 @@ +test_kind: js_test + +selector: + roots: + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_batching_1.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_batching_2.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_bad_setup.js + +executor: + fixture: + class: ReplicaSetFixture + mongod_options: + bind_ip_all: "" + set_parameters: + enableTestCommands: 1 + featureFlagStreams: true + diagnosticDataCollectionEnabled: false + num_nodes: 1 diff --git a/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_4.yml b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_4.yml new file mode 100644 index 00000000000..3bf0381c8e9 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/streams_aspio_iceberg_4.yml @@ -0,0 +1,18 @@ +test_kind: js_test + +selector: + roots: + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_dlq.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_benchmark_one_partition.js + - src/mongo/db/modules/*/jstests/streams/aspio/iceberg/iceberg_benchmark_many_partitions.js + +executor: + fixture: + class: ReplicaSetFixture + mongod_options: + bind_ip_all: "" + set_parameters: + enableTestCommands: 1 + featureFlagStreams: true + diagnosticDataCollectionEnabled: false + num_nodes: 1 diff --git a/etc/burn_in_tests.yml b/etc/burn_in_tests.yml index 070ad6265df..c1a290ff652 100644 --- a/etc/burn_in_tests.yml +++ b/etc/burn_in_tests.yml @@ -9,7 +9,12 @@ selector: # its own broker - streams_kafka # This suite requires sidecar containers. - - streams_aspio_gen + - streams_aspio + - streams_aspio_iceberg_0 + - streams_aspio_iceberg_1 + - streams_aspio_iceberg_2 + - streams_aspio_iceberg_3 + - streams_aspio_iceberg_4 # Exclude list of etc/evergreen.yml task names. exclude_tasks: # Exclude list of jstests file names. diff --git a/etc/evergreen_yml_components/tasks/resmoke/non_server_teams/tasks.yml b/etc/evergreen_yml_components/tasks/resmoke/non_server_teams/tasks.yml index 81967df21fe..f22ae795afd 100644 --- a/etc/evergreen_yml_components/tasks/resmoke/non_server_teams/tasks.yml +++ b/etc/evergreen_yml_components/tasks/resmoke/non_server_teams/tasks.yml @@ -355,8 +355,8 @@ tasks: - func: "do setup" - func: "run tests" - - <<: *gen_task_template - name: streams_aspio_gen + - <<: *task_template + name: streams_aspio tags: [ "assigned_to_jira_team_streams", @@ -365,9 +365,84 @@ tasks: "requires_extra_system_deps", ] commands: - - func: "generate resmoke tasks" + - func: "do setup" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + + - <<: *task_template + name: streams_aspio_iceberg_0 + tags: + [ + "assigned_to_jira_team_streams", + "default", + "streams_release_test", + "requires_extra_system_deps", + ] + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + + - <<: *task_template + name: streams_aspio_iceberg_1 + tags: + [ + "assigned_to_jira_team_streams", + "default", + "streams_release_test", + "requires_extra_system_deps", + ] + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + + - <<: *task_template + name: streams_aspio_iceberg_2 + tags: + [ + "assigned_to_jira_team_streams", + "default", + "streams_release_test", + "requires_extra_system_deps", + ] + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + + - <<: *task_template + name: streams_aspio_iceberg_3 + tags: + [ + "assigned_to_jira_team_streams", + "default", + "streams_release_test", + "requires_extra_system_deps", + ] + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_jobs_max: 1 + + - <<: *task_template + name: streams_aspio_iceberg_4 + tags: + [ + "assigned_to_jira_team_streams", + "default", + "streams_release_test", + "requires_extra_system_deps", + ] + commands: + - func: "do setup" + - func: "run tests" vars: - fallback_num_sub_suites: 2 resmoke_jobs_max: 1 - name: streams_build_only_gen @@ -392,7 +467,6 @@ tasks: # Update with all gen tasks to depend on here and the display name in evergreen_gen_streams_build_and_push_task.py - name: streams_gen - name: streams_kafka_gen - - name: streams_aspio_gen commands: - func: "streams build and push" diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index 2765a34160c..76de6c70488 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -522,7 +522,12 @@ buildvariants: - name: streams_lambda - name: streams_s3 - name: streams_kinesis - - name: streams_aspio_gen + - name: streams_aspio + - name: streams_aspio_iceberg_0 + - name: streams_aspio_iceberg_1 + - name: streams_aspio_iceberg_2 + - name: streams_aspio_iceberg_3 + - name: streams_aspio_iceberg_4 - name: streams_build_and_push_gen - name: generate_buildid_to_debug_symbols_mapping @@ -568,7 +573,12 @@ buildvariants: - name: streams_lambda - name: streams_s3 - name: aggregation - - name: streams_aspio_gen + - name: streams_aspio + - name: streams_aspio_iceberg_0 + - name: streams_aspio_iceberg_1 + - name: streams_aspio_iceberg_2 + - name: streams_aspio_iceberg_3 + - name: streams_aspio_iceberg_4 - name: streams_build_and_push_gen # Only needed once to generate the streams manifest for both x86 and arm - name: streams_publish_manifest_al2023_gen @@ -615,7 +625,12 @@ buildvariants: - name: streams_lambda - name: streams_s3 - name: streams_kinesis - - name: streams_aspio_gen + - name: streams_aspio + - name: streams_aspio_iceberg_0 + - name: streams_aspio_iceberg_1 + - name: streams_aspio_iceberg_2 + - name: streams_aspio_iceberg_3 + - name: streams_aspio_iceberg_4 - name: streams_build_and_push_gen - name: generate_buildid_to_debug_symbols_mapping @@ -661,7 +676,12 @@ buildvariants: - name: streams_lambda - name: streams_s3 - name: streams_kinesis - - name: streams_aspio_gen + - name: streams_aspio + - name: streams_aspio_iceberg_0 + - name: streams_aspio_iceberg_1 + - name: streams_aspio_iceberg_2 + - name: streams_aspio_iceberg_3 + - name: streams_aspio_iceberg_4 - name: streams_build_and_push_gen # Only needed once to generate the streams manifest for both x86 and arm - name: streams_publish_manifest_gen