diff options
25 files changed, 106 insertions, 4 deletions
diff --git a/buildscripts/resmokeconfig/suites/disk_mmapv1.yml b/buildscripts/resmokeconfig/suites/disk_mmapv1.yml index 5083857eb73..0b3bd248bed 100644 --- a/buildscripts/resmokeconfig/suites/disk_mmapv1.yml +++ b/buildscripts/resmokeconfig/suites/disk_mmapv1.yml @@ -10,6 +10,7 @@ selector: - jstests/disk/repair3.js - jstests/disk/repair4.js exclude_with_any_tags: + - requires_mobile_se - requires_wiredtiger executor: diff --git a/buildscripts/resmokeconfig/suites/disk_mobile.yml b/buildscripts/resmokeconfig/suites/disk_mobile.yml new file mode 100644 index 00000000000..702a41f6219 --- /dev/null +++ b/buildscripts/resmokeconfig/suites/disk_mobile.yml @@ -0,0 +1,28 @@ +test_kind: js_test + +selector: + roots: + - jstests/disk/*.js + exclude_files: + - jstests/disk/directoryperdb.js + exclude_with_any_tags: + - requires_mmapv1 + - requires_wiredtiger + +executor: + config: + shell_options: + global_vars: + TestData: + storageEngine: mobile + readMode: commands + hooks: + - class: ValidateCollections + - class: CleanEveryN + n: 1 + fixture: + class: MongoDFixture + mongod_options: + set_parameters: + enableTestCommands: 1 + storageEngine: mobile diff --git a/buildscripts/resmokeconfig/suites/disk_wiredtiger.yml b/buildscripts/resmokeconfig/suites/disk_wiredtiger.yml index eb7f3bad338..0d7debc34e8 100644 --- a/buildscripts/resmokeconfig/suites/disk_wiredtiger.yml +++ b/buildscripts/resmokeconfig/suites/disk_wiredtiger.yml @@ -5,6 +5,7 @@ selector: - jstests/disk/*.js exclude_with_any_tags: - requires_mmapv1 + - requires_mobile_se executor: config: diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f3c1b5d226a..6a574427f0c 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -2913,6 +2913,15 @@ tasks: run_multiple_jobs: false - <<: *task_template + name: disk_mobile + commands: + - func: "do setup" + - func: "run tests" + vars: + resmoke_args: --suites=disk_mobile --storageEngine=mobile + run_multiple_jobs: false + +- <<: *task_template name: disk_wiredtiger commands: - func: "do setup" @@ -8178,6 +8187,51 @@ buildvariants: - name: update_fuzzer - name: update_fuzzer_replication +- name: enterprise-rhel-62-64-bit-mobile + display_name: Enterprise RHEL 6.2 (mobile) + modules: + - enterprise + run_on: + - rhel62-small + batchtime: 1440 # 1 day + expansions: + gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH" + tooltags: "-tags 'ssl sasl'" + rlp_environment: MONGOD_UNITTEST_RLP_LANGUAGE_TEST_BTROOT=/opt/basis + test_flags: --storageEngine=mobile --excludeWithAnyTags=requires_mmapv1,requires_wiredtiger,requires_sharding,requires_replication + compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_gcc.vars CPPPATH="/opt/basis/rlp/rlp/include /opt/basis/rlp/utilities/include" --use-basis-tech-rosette-linguistics-platform=on + num_jobs_available: $(grep -c ^processor /proc/cpuinfo) + use_scons_cache: true + build_mongoreplay: true + tasks: + - name: compile + distros: + - rhel62-large + - name: compile_all + distros: + - rhel62-large + - name: aggregation + - name: aggregation_auth + - name: aggregation_facet_unwind_passthrough + - name: auth + - name: auth_audit + - name: disk_mobile + - name: failpoints + - name: failpoints_auth + - name: integration_tests_standalone + - name: jsCore + - name: jsCore_auth + - name: jsCore_compatibility + - name: jsCore_decimal + - name: jsCore_minimum_batch_size + - name: jsCore_op_query + - name: jsonSchema + - name: aggregation_fuzzer + - name: rlp + - name: sasl + - name: session_jscore_passthrough + - name: snmp + - name: linux-64-ephemeralForTest display_name: Linux (ephemeralForTest) run_on: diff --git a/jstests/aggregation/bugs/server6179.js b/jstests/aggregation/bugs/server6179.js index 4e98ee17eb5..d04e9a590c2 100644 --- a/jstests/aggregation/bugs/server6179.js +++ b/jstests/aggregation/bugs/server6179.js @@ -1,4 +1,5 @@ // SERVER-6179: support for two $groups in sharded agg +// @tags: [requires_sharding] (function() { 'use strict'; diff --git a/jstests/aggregation/bugs/server7781.js b/jstests/aggregation/bugs/server7781.js index cfa10c699ed..4394fc4f3bb 100644 --- a/jstests/aggregation/bugs/server7781.js +++ b/jstests/aggregation/bugs/server7781.js @@ -1,4 +1,5 @@ // SERVER-7781 $geoNear pipeline stage +// @tags: [requires_sharding] (function() { 'use strict'; diff --git a/jstests/aggregation/mongos_merge.js b/jstests/aggregation/mongos_merge.js index 76108fdf602..6229f4c6e74 100644 --- a/jstests/aggregation/mongos_merge.js +++ b/jstests/aggregation/mongos_merge.js @@ -10,7 +10,7 @@ * and will therefore invalidate the results of the test cases below, we tag this test to prevent it * running under the 'aggregation_facet_unwind' passthrough. * - * @tags: [do_not_wrap_aggregations_in_facets] + * @tags: [do_not_wrap_aggregations_in_facets, requires_sharding] */ (function() { diff --git a/jstests/aggregation/mongos_slaveok.js b/jstests/aggregation/mongos_slaveok.js index 58440deed14..62a467e9c35 100644 --- a/jstests/aggregation/mongos_slaveok.js +++ b/jstests/aggregation/mongos_slaveok.js @@ -1,6 +1,7 @@ /** * Tests aggregate command against mongos with slaveOk. For more tests on read preference, * please refer to jstests/sharding/read_pref_cmd.js. + * @tags: [requires_sharding] */ (function() { load('jstests/replsets/rslib.js'); diff --git a/jstests/aggregation/shard_targeting.js b/jstests/aggregation/shard_targeting.js index c78bb93a29a..c33b0ab5d1c 100644 --- a/jstests/aggregation/shard_targeting.js +++ b/jstests/aggregation/shard_targeting.js @@ -20,7 +20,7 @@ * and will therefore invalidate the results of the test cases below, we tag this test to prevent it * running under the 'aggregation_facet_unwind' passthrough. * - * @tags: [do_not_wrap_aggregations_in_facets] + * @tags: [do_not_wrap_aggregations_in_facets, requires_sharding] */ (function() { load("jstests/libs/profiler.js"); // For profilerHas*OrThrow helper functions. diff --git a/jstests/aggregation/sources/addFields/use_cases.js b/jstests/aggregation/sources/addFields/use_cases.js index 725408fb40d..8857c3b9e66 100644 --- a/jstests/aggregation/sources/addFields/use_cases.js +++ b/jstests/aggregation/sources/addFields/use_cases.js @@ -2,6 +2,7 @@ * $addFields can be used to add fixed and computed fields to documents while preserving the * original document. Verify that using $addFields and adding computed fields in a $project yield * the same result. + * @tags: [requires_sharding] */ (function() { @@ -61,4 +62,4 @@ st.stop(); print("Success! Sharding use case test for $addFields passed."); -}());
\ No newline at end of file +}()); diff --git a/jstests/aggregation/sources/collStats/shard_host_info.js b/jstests/aggregation/sources/collStats/shard_host_info.js index 0c78137930f..2d504d6a9b5 100644 --- a/jstests/aggregation/sources/collStats/shard_host_info.js +++ b/jstests/aggregation/sources/collStats/shard_host_info.js @@ -1,6 +1,7 @@ /** * Verifies that the $collStats aggregation stage includes the shard and hostname for each output * document when run via mongoS, and that the former is absent when run on a non-shard mongoD. + * @tags: [requires_sharding] */ (function() { "use strict"; diff --git a/jstests/aggregation/sources/facet/use_cases.js b/jstests/aggregation/sources/facet/use_cases.js index fed4c0b0c5c..29db4222386 100644 --- a/jstests/aggregation/sources/facet/use_cases.js +++ b/jstests/aggregation/sources/facet/use_cases.js @@ -1,5 +1,6 @@ /** * Tests some practical use cases of the $facet stage. + * @tags: [requires_sharding] */ (function() { "use strict"; diff --git a/jstests/aggregation/testSlave.js b/jstests/aggregation/testSlave.js index 0a03d68a49b..ce6ee597218 100644 --- a/jstests/aggregation/testSlave.js +++ b/jstests/aggregation/testSlave.js @@ -1,4 +1,5 @@ // This test just make sure that aggregation is possible on a secondary node. +// @tags: [requires_replication] var replTest = new ReplSetTest({name: 'aggTestSlave', nodes: 2}); var nodes = replTest.startSet(); replTest.initiate(); diff --git a/jstests/aggregation/testshard1.js b/jstests/aggregation/testshard1.js index 9062bc63521..7ae739f2b4b 100644 --- a/jstests/aggregation/testshard1.js +++ b/jstests/aggregation/testshard1.js @@ -1,3 +1,4 @@ +// @tags: [requires_sharding] load('jstests/aggregation/extras/utils.js'); load('jstests/libs/analyze_plan.js'); // For planHasStage. diff --git a/jstests/auth/arbiter.js b/jstests/auth/arbiter.js index df9f85a8015..f272cc7bc65 100644 --- a/jstests/auth/arbiter.js +++ b/jstests/auth/arbiter.js @@ -1,5 +1,6 @@ // Certain commands should be run-able from arbiters under localhost, but not from // any other nodes in the replset. +// @tags: [requires_replication] var name = "arbiter_localhost_test"; var key = "jstests/libs/key1"; diff --git a/jstests/auth/authentication_restrictions.js b/jstests/auth/authentication_restrictions.js index 17d656c9f05..e69a411795d 100644 --- a/jstests/auth/authentication_restrictions.js +++ b/jstests/auth/authentication_restrictions.js @@ -1,5 +1,6 @@ /** * This test checks that authentication restrictions can be set and respected. + * @tags: [requires_sharding, requires_replication] */ (function() { diff --git a/jstests/auth/authentication_restrictions_role.js b/jstests/auth/authentication_restrictions_role.js index 80e9df6c794..640e671364c 100644 --- a/jstests/auth/authentication_restrictions_role.js +++ b/jstests/auth/authentication_restrictions_role.js @@ -1,5 +1,6 @@ /** * This test checks that authentication restrictions can be set on roles and respected. + * @tags: [requires_replication, requires_sharding] */ (function() { diff --git a/jstests/auth/copyauth.js b/jstests/auth/copyauth.js index 0bad123cb98..faf5badd5ff 100644 --- a/jstests/auth/copyauth.js +++ b/jstests/auth/copyauth.js @@ -32,6 +32,7 @@ var baseName = "jstests_clone_copyauth"; * Member functions: * * stop() - stop and cleanup whatever nodes the helper spawned when it was created. + * @tags: [requires_replication, requires_sharding] */ function ClusterSpawnHelper(clusterType, startWithAuth, startWithTransitionToAuth) { var singleNodeConfig = {}; diff --git a/jstests/auth/copyauth_between_shards.js b/jstests/auth/copyauth_between_shards.js index 419d548f969..17fc908208f 100644 --- a/jstests/auth/copyauth_between_shards.js +++ b/jstests/auth/copyauth_between_shards.js @@ -1,5 +1,6 @@ // Test copyDatabase command inside a sharded cluster with and without auth. Tests with auth are // currently disabled due to SERVER-13080. +// @tags: [requires_sharding] var baseName = "jstests_clone_copyauth_between_shards"; diff --git a/jstests/auth/repl_auth.js b/jstests/auth/repl_auth.js index aa851840bc5..17a6e13bd4b 100644 --- a/jstests/auth/repl_auth.js +++ b/jstests/auth/repl_auth.js @@ -1,6 +1,7 @@ /** * Test that the replica set connections to the secondaries will have the right auth credentials * even when these connections are shared within the same connection pool. + * @tags: [requires_replication] */ var NUM_NODES = 3; diff --git a/jstests/auth/resource_pattern_matching.js b/jstests/auth/resource_pattern_matching.js index dd83b8bf273..8173bb0e1a6 100644 --- a/jstests/auth/resource_pattern_matching.js +++ b/jstests/auth/resource_pattern_matching.js @@ -1,5 +1,6 @@ /* * Tests that resource pattern matching rules work as expected. + * @tags: [requires_replication, requires_sharding] */ function setup_users(granter) { diff --git a/jstests/auth/secondary_invalidation.js b/jstests/auth/secondary_invalidation.js index 3752a3aa678..8500322751f 100644 --- a/jstests/auth/secondary_invalidation.js +++ b/jstests/auth/secondary_invalidation.js @@ -1,6 +1,7 @@ /** * Test that user modifications on replica set primaries * will invalidate cached user credentials on secondaries + * @tags: [requires_replication] */ var NUM_NODES = 3; diff --git a/jstests/auth/upgrade_noauth_to_keyfile.js b/jstests/auth/upgrade_noauth_to_keyfile.js index 080c7217c00..9bf2ec115e6 100644 --- a/jstests/auth/upgrade_noauth_to_keyfile.js +++ b/jstests/auth/upgrade_noauth_to_keyfile.js @@ -2,7 +2,7 @@ * This test checks the upgrade path from noauth to keyFile. * * This test requires users to persist across a restart. - * @tags: [requires_persistence] + * @tags: [requires_persistence, requires_replication] */ load('jstests/multiVersion/libs/multi_rs.js'); diff --git a/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js b/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js index 8cfca96933a..49d9e40c87c 100644 --- a/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js +++ b/jstests/auth/upgrade_noauth_to_keyfile_with_sharding.js @@ -1,5 +1,6 @@ // Tests access control upgrade on a sharded cluster // The purpose is to verify the connectivity between mongos, config server, and the shards +// @tags: [requires_sharding] load('jstests/ssl/libs/ssl_helpers.js'); diff --git a/jstests/auth/user_defined_roles_on_secondaries.js b/jstests/auth/user_defined_roles_on_secondaries.js index c405363c575..81a33a38d8a 100644 --- a/jstests/auth/user_defined_roles_on_secondaries.js +++ b/jstests/auth/user_defined_roles_on_secondaries.js @@ -32,6 +32,7 @@ * First, it sets up a 1-node replicaset and adds some roles. * Then, it adds a second node to the replicaset, and verifies that the roles sync correctly. * Then, it runs a variety of operations on the primary, and ensures that they replicate correctly. + * @tags: [requires_replication] */ (function() { |