PERF-1605 Make sys-perf run using Enterprise MongoDB binaries

1 files changed, 26 insertions, 16 deletions

diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index d0371237310..a9285e129da 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -177,6 +177,7 @@ functions:
           dsi: ${dsi_rev}
           workloads: ${workloads_rev}
           linkbench: ${linkbench_rev}
+          enterprise: ${enterprise_rev}
     - command: shell.exec
       params:
         working_dir: work
@@ -215,6 +216,7 @@ functions:
           script_flags : ${script_flags}
           dsi_rev: ${dsi_rev}
           workloads_rev: ${workloads_rev}
+          enterprise_rev: ${enterprise_rev}
           EOF
 
     - command: shell.exec
@@ -307,6 +309,8 @@ tasks:
     - command: manifest.load
     - command: git.get_project
       params:
+        revisions:
+          enterprise: ${enterprise_rev}
         directory: src
     - func: "compile mongodb"
 
@@ -631,27 +635,33 @@ modules:
   prefix: linkbench
   branch: master
 
+- name: enterprise
+  repo: git@github.com:10gen/mongo-enterprise-modules.git
+  prefix: src/mongo/db/modules
+  branch: master
+
 #######################################
 #         Buildvariants               #
 #######################################
 buildvariants:
 
-# We are explicitly tracking the rhel70 variant compile options from evergreen.yml.  If we can get
+# We are explicitly tracking the Linux 64 Amazon variant compile options from evergreen.yml.  If we can get
 # proper artifacts directly from that project, we should do that and remove these tasks.
-- name: compile-rhel70
-  display_name: Compile on rhel70
+- name: compile-linux-64-amzn
+  display_name: Compile on Linux64 Amazon
   batchtime: 1440 # 24 hours
   modules:
     - wtdevelop
+    - enterprise
   expansions:
-    compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
+    compile_flags: --ssl MONGO_DISTMOD=linux-64-amzn-build -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
     gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
     platform: linux
     project_dir: &project_dir dsi
     tooltags: ""
     use_scons_cache: true
   run_on:
-      - "rhel70"
+      - "linux-64-amzn-build"
   tasks:
     - name: compile
     - name: compile_wtdevelop
@@ -678,7 +688,7 @@ buildvariants:
       - "rhel70-perf-single"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: &1nodetasks
     - name: industry_benchmarks
     - name: crud_workloads
@@ -711,7 +721,7 @@ buildvariants:
       - "rhel70-perf-single"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: &standalonetasks
     - name: industry_benchmarks
     - name: crud_workloads
@@ -738,7 +748,7 @@ buildvariants:
       - "rhel70-perf-shard"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks:
     - name: industry_benchmarks
     - name: crud_workloads
@@ -767,7 +777,7 @@ buildvariants:
       - "rhel70-perf-shard-lite"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: &shardlitetasks
     - name: bestbuy_agg
     - name: bestbuy_query
@@ -797,7 +807,7 @@ buildvariants:
       - "rhel70-perf-replset"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: &3nodetasks
     - name: industry_benchmarks
     - name: industry_benchmarks_secondary_reads
@@ -830,7 +840,7 @@ buildvariants:
     project_dir: *project_dir
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   run_on:
       - "rhel70-perf-replset"
   tasks:
@@ -850,7 +860,7 @@ buildvariants:
       - "rhel70-perf-initialsync-logkeeper"
   depends_on:
       - name: compile
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks:
     - name: initialsync-logkeeper
 
@@ -873,7 +883,7 @@ buildvariants:
       - "rhel70-perf-single"
   depends_on:
       - name: compile_wtdevelop
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: *1nodetasks
 
 - name: wtdevelop-standalone
@@ -892,7 +902,7 @@ buildvariants:
       - "rhel70-perf-single"
   depends_on:
       - name: compile_wtdevelop
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: *standalonetasks
 
 - name: wtdevelop-3-node-replSet
@@ -911,7 +921,7 @@ buildvariants:
       - "rhel70-perf-replset"
   depends_on:
       - name: compile_wtdevelop
-        variant: compile-rhel70
+        variant: compile-linux-64-amzn
   tasks: *3nodetasks
 
 # Disabled: SERVER-35586
@@ -931,5 +941,5 @@ buildvariants:
 #      - "rhel70-perf-shard-lite"
 #  depends_on:
 #      - name: compile_wtdevelop
-#        variant: compile-rhel70
+#        variant: compile-linux-64-amzn
 #  tasks: *shardlitetasks