From c19a106e916d41da9239df6e644fa652ff90cff8 Mon Sep 17 00:00:00 2001 From: Suganthi Mani Date: Tue, 5 Sep 2023 16:22:49 +0000 Subject: [PATCH] SERVER-80717 Avoid shard merge tests in non-enterprise multiversion suite. --- .../tenant_migration_donor_abort_on_fcv_change.js | 5 +++++ .../tenant_migration_donor_recipient_fcv_mismatch.js | 5 +++++ .../tenant_migration_recipient_abort_on_fcv_change.js | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_abort_on_fcv_change.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_abort_on_fcv_change.js index 0b8c5bd3406..a15149f16a4 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_abort_on_fcv_change.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_abort_on_fcv_change.js @@ -13,6 +13,11 @@ import {TenantMigrationTest} from "jstests/replsets/libs/tenant_migration_test.j import {makeTenantDB} from "jstests/replsets/libs/tenant_migration_util.js"; import {setLogVerbosity} from "jstests/replsets/rslib.js"; +if (!buildInfo()["modules"].includes("enterprise")) { + jsTestLog("Skipping test as it requires the enterprise module"); + quit(); +} + const tenantMigrationTest = new TenantMigrationTest({name: jsTestName()}); const tenantId = ObjectId().str; diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js index 0bffcf5bc8f..a142f67d966 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_donor_recipient_fcv_mismatch.js @@ -12,6 +12,11 @@ import {extractUUIDFromObject} from "jstests/libs/uuid_util.js"; import {TenantMigrationTest} from "jstests/replsets/libs/tenant_migration_test.js"; import {isShardMergeEnabled, makeTenantDB} from "jstests/replsets/libs/tenant_migration_util.js"; +if (!buildInfo()["modules"].includes("enterprise")) { + jsTestLog("Skipping test as it requires the enterprise module"); + quit(); +} + function runTest(downgradeFCV) { const tenantMigrationTest = new TenantMigrationTest({name: jsTestName()}); diff --git a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_recipient_abort_on_fcv_change.js b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_recipient_abort_on_fcv_change.js index 560ce84730a..19e9888c638 100644 --- a/jstests/multiVersion/genericSetFCVUsage/tenant_migration_recipient_abort_on_fcv_change.js +++ b/jstests/multiVersion/genericSetFCVUsage/tenant_migration_recipient_abort_on_fcv_change.js @@ -13,6 +13,11 @@ import {TenantMigrationTest} from "jstests/replsets/libs/tenant_migration_test.j import {makeTenantDB} from "jstests/replsets/libs/tenant_migration_util.js"; import {setLogVerbosity} from "jstests/replsets/rslib.js"; +if (!buildInfo()["modules"].includes("enterprise")) { + jsTestLog("Skipping test as it requires the enterprise module"); + quit(); +} + const tenantMigrationTest = new TenantMigrationTest({name: jsTestName()}); const tenantId = ObjectId().str;