SERVER-20885 Merge Linux Enterprise and Enterprise RHEL 62

1 files changed, 82 insertions, 121 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 1c91d4809f1..b04afa6c512 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -2173,123 +2173,6 @@ buildvariants:
     distros:
     - rhel55-test
 
-- name: enterprise-linux-64
-  display_name: Enterprise Linux
-  modules:
-  - enterprise
-  run_on:
-  - rhel62-test
-  expansions:
-    gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
-    tooltags: "-tags 'ssl sasl'"
-    rlp_environment: MONGOD_UNITTEST_RLP_LANGUAGE_TEST_BTROOT=/opt/basis
-    compile_flags: --ssl MONGO_DISTMOD=rhel62 -j$(grep -c ^processor /proc/cpuinfo) --release CC=/opt/mongodbtoolchain/bin/gcc CXX=/opt/mongodbtoolchain/bin/g++ 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)
-    test_flags: --continueOnFailure
-  tasks:
-  - name: compile
-    <<: *MAX_PRIORITY
-    distros:
-    - rhel62-build
-  - name: lint
-  - name: aggregation
-  - name: aggregation_WT
-  - name: aggregation_auth
-  - name: audit
-  - name: audit_WT
-  - name: auth
-  - name: auth_WT
-  - name: auth_audit
-  - name: auth_audit_WT
-  - name: bulk_gle_passthrough
-  - name: bulk_gle_passthrough_WT
-  - name: concurrency
-  - name: concurrency_WT
-  - name: concurrency_replication
-  - name: concurrency_replication_WT
-  - name: concurrency_sharded
-  - name: concurrency_sharded_WT
-  - name: dbtest
-  - name: dbtest_WT
-  - name: disk
-  - name: dur_jscore_passthrough
-  - name: durability
-  - name: ese_WT
-  - name: failpoints
-  - name: failpoints_auth
-  - name: gle_auth
-  - name: gle_auth_WT
-  - name: gle_auth_basics_passthrough
-  - name: gle_auth_basics_passthrough_WT
-  - name: gle_auth_basics_passthrough_write_cmd
-  - name: gle_auth_basics_passthrough_write_cmd_WT
-  - name: gle_auth_write_cmd
-  - name: gle_auth_write_cmd_WT
-  - name: integration_tests_replset
-  - name: integration_tests_standalone
-  - name: jsCore
-  - name: jsCore_WT
-  - name: jsCore_WT_ese
-  - name: jsCore_auth
-  - name: jsCore_compatibility
-  - name: jsCore_compatibility_WT
-  - name: jsCore_op_query
-  - name: jsCore_op_query_WT
-  - name: jsCore_small_oplog
-  - name: jsCore_small_oplog_WT
-  - name: jsCore_small_oplog_rs
-  - name: jsCore_small_oplog_rs_WT
-  - name: jstestfuzz
-  - name: mmap
-  - name: mongosTest
-  - name: multiversion
-  - name: noPassthrough
-  - name: noPassthroughWithMongod
-  - name: noPassthroughWithMongod_WT
-  - name: noPassthrough_WT
-  - name: parallel
-  - name: parallel_WT
-  - name: parallel_compatibility
-  - name: parallel_compatibility_WT
-  - name: read_concern_majority_passthrough_WT
-  - name: replicasets
-  - name: replicasets_WT
-  - name: replicasets_WT_ese
-  - name: replicasets_auth
-  - name: replicasets_legacy
-  - name: replication
-  - name: replication_WT
-  - name: replication_auth
-  - name: rlp
-  - name: rlp_WT
-  - name: sasl
-  - name: sharded_collections_jscore_passthrough
-  - name: sharded_collections_jscore_passthrough_WT
-  - name: sharding
-  - name: sharding_WT
-  - name: sharding_WT_ese
-  - name: sharding_auth
-  - name: sharding_auth_audit_WT
-  - name: sharding_gle_auth_basics_passthrough
-  - name: sharding_gle_auth_basics_passthrough_WT
-  - name: sharding_gle_auth_basics_passthrough_write_cmd
-  - name: sharding_gle_auth_basics_passthrough_write_cmd_WT
-  - name: sharding_jscore_passthrough
-  - name: sharding_jscore_passthrough_WT
-  - name: sharding_jscore_passthrough_wire_ops_WT
-  - name: sharding_legacy
-  - name: slow1
-  - name: slow1_WT
-  - name: slow2
-  - name: slow2_WT
-  - name: snmp
-  - name: snmp_WT
-  - name: ssl
-  - name: sslSpecial
-  - name: tool
-  - name: tool_WT
-  - name: unittests
-
 - name: linux-64-repeated-execution
   stepback: false
   display_name: ~ Linux Repeated Execution
@@ -3686,7 +3569,6 @@ buildvariants:
   - enterprise
   run_on:
   - rhel62-test
-  batchtime: 1440 # 1 day
   expansions:
     gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
     tooltags: "-tags 'ssl sasl'"
@@ -3705,24 +3587,103 @@ buildvariants:
   - name: compile
     distros:
     - rhel62-build
+  - name: lint
+  - name: aggregation
+  - name: aggregation_WT
+  - name: aggregation_auth
   - name: audit
   - name: audit_WT
+  - name: auth
+  - name: auth_WT
+  - name: auth_audit
+  - name: auth_audit_WT
+  - name: bulk_gle_passthrough
+  - name: bulk_gle_passthrough_WT
+  - name: concurrency
+  - name: concurrency_WT
+  - name: concurrency_replication
+  - name: concurrency_replication_WT
+  - name: concurrency_sharded
+  - name: concurrency_sharded_WT
   - name: dbtest
   - name: dbtest_WT
+  - name: disk
+  - name: dur_jscore_passthrough
+  - name: durability
   - name: ese_WT
-  - name: jstestfuzz
-  - name: mmap
+  - name: failpoints
+  - name: failpoints_auth
+  - name: gle_auth
+  - name: gle_auth_WT
+  - name: gle_auth_basics_passthrough
+  - name: gle_auth_basics_passthrough_WT
+  - name: gle_auth_basics_passthrough_write_cmd
+  - name: gle_auth_basics_passthrough_write_cmd_WT
+  - name: gle_auth_write_cmd
+  - name: gle_auth_write_cmd_WT
+  - name: integration_tests_replset
+  - name: integration_tests_standalone
   - name: jsCore
+  - name: jsCore_WT
+  - name: jsCore_WT_ese
   - name: jsCore_auth
+  - name: jsCore_compatibility
+  - name: jsCore_compatibility_WT
+  - name: jsCore_op_query
+  - name: jsCore_op_query_WT
+  - name: jsCore_small_oplog
+  - name: jsCore_small_oplog_WT
+  - name: jsCore_small_oplog_rs
+  - name: jsCore_small_oplog_rs_WT
+  - name: jstestfuzz
+  - name: mmap
+  - name: mongosTest
+  - name: multiversion
+  - name: noPassthrough
+  - name: noPassthroughWithMongod
+  - name: noPassthroughWithMongod_WT
+  - name: noPassthrough_WT
+  - name: parallel
+  - name: parallel_WT
+  - name: parallel_compatibility
+  - name: parallel_compatibility_WT
+  - name: read_concern_majority_passthrough_WT
+  - name: replicasets
+  - name: replicasets_WT
+  - name: replicasets_WT_ese
   - name: replicasets_auth
-  - name: rlp # RLP only runs on this variant
+  - name: replicasets_legacy
+  - name: replication
+  - name: replication_WT
+  - name: replication_auth
+  - name: rlp
   - name: rlp_WT
   - name: sasl
+  - name: sharded_collections_jscore_passthrough
+  - name: sharded_collections_jscore_passthrough_WT
+  - name: sharding
+  - name: sharding_WT
+  - name: sharding_WT_ese
   - name: sharding_auth
+  - name: sharding_auth_audit_WT
+  - name: sharding_gle_auth_basics_passthrough
+  - name: sharding_gle_auth_basics_passthrough_WT
+  - name: sharding_gle_auth_basics_passthrough_write_cmd
+  - name: sharding_gle_auth_basics_passthrough_write_cmd_WT
+  - name: sharding_jscore_passthrough
+  - name: sharding_jscore_passthrough_WT
+  - name: sharding_jscore_passthrough_wire_ops_WT
+  - name: sharding_legacy
+  - name: slow1
+  - name: slow1_WT
+  - name: slow2
+  - name: slow2_WT
   - name: snmp
   - name: snmp_WT
   - name: ssl
   - name: sslSpecial
+  - name: tool
+  - name: tool_WT
   - name: unittests
   - name: push
     distros: