summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/evergreen.yml3
-rw-r--r--etc/evergreen_yml_components/definitions.yml9
2 files changed, 12 insertions, 0 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 24b3c5ddb20..6233140f3f7 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -1486,6 +1486,7 @@ buildvariants:
- name: .updatefuzzer
- name: secondary_reads_passthrough_gen
- name: .shard_split
+ - name: .shard_merge
# Disabling as the following tests are not aware of feature flags.
# - name: server_discovery_and_monitoring_json_test_TG
# distros:
@@ -2279,6 +2280,7 @@ buildvariants:
- name: .watchdog
- name: .stitch
- name: .shard_split
+ - name: .shard_merge
# Disabling the following tests as they are not aware of feature flags.
# - name: .benchmarks - building benchmarks is also disabled
# - name: unittest_shell_hang_analyzer_gen
@@ -2440,6 +2442,7 @@ buildvariants:
- name: .updatefuzzer
- name: watchdog_wiredtiger
- name: .shard_split
+ - name: .shard_merge
# Disabling the following tests as they are not aware of feature flags.
# - name: .benchmarks - building benchmarks is also disabled
# - name: server_discovery_and_monitoring_json_test_TG
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml
index a531a316ba5..78e35f57860 100644
--- a/etc/evergreen_yml_components/definitions.yml
+++ b/etc/evergreen_yml_components/definitions.yml
@@ -5402,6 +5402,15 @@ tasks:
use_large_distro: "true"
fallback_num_sub_suites: 10
+# TODO(SERVER-57896): Add "serverless" tag to shard merge passthrough when no longer feature flagged
+- <<: *gen_task_template
+ name: shard_merge_jscore_passthrough_gen
+ tags: ["shard_merge"]
+ commands:
+ - func: "generate resmoke tasks"
+ vars:
+ use_large_distro: "true"
+
- <<: *gen_task_template
name: tenant_migration_jscore_passthrough_gen
tags: ["serverless"]