diff options
author | Kashish Garg <kashish.garg@mongodb.com> | 2018-08-01 15:26:02 -0400 |
---|---|---|
committer | Kashish Garg <kashish.garg@mongodb.com> | 2018-08-02 15:55:25 -0400 |
commit | e68e228f0ebc6c70b808c173cedbda2b7dcfc87c (patch) | |
tree | 66e6c2dde97a7c67a255251eadd5c3b03e698ee8 | |
parent | eb8bc29deed882f86f0103df2489cf6e2d4f4113 (diff) | |
download | mongo-e68e228f0ebc6c70b808c173cedbda2b7dcfc87c.tar.gz |
SERVER-36369 system_perf.yml: Create separate compile task for enterprise modules
-rw-r--r-- | etc/system_perf.yml | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 6abb93b8b57..d0652d333a2 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -71,7 +71,7 @@ functions: MONGO_VERSION=$(git describe) # If we're going to compile the upstream wtdevelop repository for wiredtiger, add # that githash to version string. - if [ "${wtdevelop|}" = "-wtdevelop" ]; then + if [ "${compile-variant|}" = "-wtdevelop" ]; then WT_VERSION=$(cd src/third_party/wtdevelop; git describe | cut -c 9-) MONGO_VERSION="$MONGO_VERSION-wtdevelop-$WT_VERSION" fi @@ -136,17 +136,17 @@ functions: load('jstests/hooks/run_validate_collections.actual.js'); EOF fi - tar czf mongodb${wtdevelop|}.tar.gz mongodb + tar czf mongodb${compile-variant|}.tar.gz mongodb - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: src/mongodb${wtdevelop|}.tar.gz - remote_file: ${project_dir}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz + local_file: src/mongodb${compile-variant|}.tar.gz + remote_file: ${project_dir}/${version_id}/${revision}/${platform}/mongodb${compile-variant|}-${version_id}.tar.gz bucket: mciuploads permissions: public-read content_type: ${content_type|application/x-gzip} - display_name: mongodb${wtdevelop|}.tar.gz + display_name: mongodb${compile-variant|}.tar.gz # NOTE: Unlike evergreen.yml, there's no conditional here. If called, this is never a noop! "use WiredTiger develop" : @@ -189,7 +189,7 @@ functions: storageEngine: ${storageEngine} test_control: ${test} production: true - mongodb_binary_archive: "https://s3.amazonaws.com/mciuploads/${project_dir}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz" + mongodb_binary_archive: "https://s3.amazonaws.com/mciuploads/${project_dir}/${version_id}/${revision}/${platform}/mongodb${compile-variant|}-${version_id}.tar.gz" workloads_dir: ../src/workloads/workloads ycsb_dir: ../src/YCSB/YCSB linkbench_dir: ../src/linkbench/linkbench @@ -309,10 +309,21 @@ tasks: - command: manifest.load - command: git.get_project params: + directory: src + - func: "compile mongodb" + +- name: compile_enterprise + commands: + - command: manifest.load + - command: git.get_project + # In addition to mongo repo, checkout enterprise as module + params: revisions: enterprise: ${enterprise_rev} directory: src - func: "compile mongodb" + vars: + compile-variant: -enterprise - name: compile_wtdevelop commands: @@ -327,7 +338,7 @@ tasks: - func: "use WiredTiger develop" - func: "compile mongodb" vars: - wtdevelop: -wtdevelop + compile-variant: -wtdevelop - name: linkbench priority: 5 @@ -663,9 +674,9 @@ buildvariants: - "linux-64-amzn-build" tasks: - name: compile + - name: compile_enterprise - name: compile_wtdevelop - ####################################### # Linux Buildvariants # ####################################### @@ -743,10 +754,11 @@ buildvariants: project_dir: *project_dir authentication: enabled storageEngine: wiredTiger + compile-variant: -enterprise run_on: - "rhel70-perf-single" depends_on: - - name: compile + - name: compile_enterprise variant: compile-linux-64-amzn tasks: &standalonetasks - name: industry_benchmarks @@ -896,7 +908,7 @@ buildvariants: cluster: single platform: linux project_dir: *project_dir - wtdevelop: -wtdevelop + compile-variant: -wtdevelop authentication: enabled storageEngine: wiredTiger run_on: @@ -915,7 +927,7 @@ buildvariants: cluster: single platform: linux project_dir: *project_dir - wtdevelop: -wtdevelop + compile-variant: -wtdevelop authentication: enabled storageEngine: wiredTiger run_on: @@ -934,7 +946,7 @@ buildvariants: cluster: replica platform: linux project_dir: *project_dir - wtdevelop: -wtdevelop + compile-variant: -wtdevelop authentication: enabled storageEngine: wiredTiger run_on: @@ -954,7 +966,7 @@ buildvariants: # cluster: shard-lite # platform: linux # project_dir: *project_dir -# wtdevelop: -wtdevelop +# compile-variant: -wtdevelop # authentication: enabled # storageEngine: wiredTiger # run_on: |