summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Russell <gabriel.russell@mongodb.com>2019-04-04 14:15:29 -0400
committerGabriel Russell <gabriel.russell@mongodb.com>2019-04-04 14:15:29 -0400
commit648b0838f9661c7a518b3fa92d99b8e1ff970abc (patch)
treeb6d3d06e4c3a7fa6ca4328ae9f12667ead0f6ea9
parent7d1ec2a68599e167dab36cbb1dd0866a812a9d2d (diff)
downloadmongo-648b0838f9661c7a518b3fa92d99b8e1ff970abc.tar.gz
SERVER-36750 fix botched backport
-rw-r--r--etc/evergreen.yml10
1 files changed, 4 insertions, 6 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index e688437c5fc..786cdad4ffd 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -4308,8 +4308,7 @@ buildvariants:
push_arch: ppc64le-enterprise-ubuntu1604
compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 -j$(echo "$(grep -c processor /proc/cpuinfo)/2" | bc) --release CCFLAGS="-mcpu=power8 -mtune=power8 -mcmodel=medium" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: 2
- test_flags: blacklist_from_ppc64le
- variant_excluded_flags: requires_mmapv1
+ variant_excluded_flags: requires_mmapv1,blacklist_from_ppc64le
has_packages: true
packager_script: packager-enterprise.py
packager_arch: ppc64le
@@ -6330,8 +6329,7 @@ buildvariants:
# We need to compensate for SMT8 setting the cpu count very high and lower the amount of parallelism down
compile_flags: --ssl MONGO_DISTMOD=rhel71 --release -j$(echo "$(grep -c processor /proc/cpuinfo)/2" | bc) CCFLAGS="-mcpu=power8 -mtune=power8 -mcmodel=medium" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: $(echo "$(grep -c processor /proc/cpuinfo)/4" | bc)
- test_flags: blacklist_from_ppc64le
- variant_excluded_flags: requires_mmapv1
+ variant_excluded_flags: requires_mmapv1,blacklist_from_ppc64le
has_packages: true
packager_script: packager-enterprise.py
packager_arch: ppc64le
@@ -7478,8 +7476,8 @@ buildvariants:
# We need to compensate for SMT8 setting the cpu count very high and lower the amount of parallelism down
compile_flags: --dbg=on --opt=on --ssl MONGO_DISTMOD=rhel71 -j$(echo "$(grep -c processor /proc/cpuinfo)/2" | bc) CCFLAGS="-mcpu=power8 -mtune=power8 -mcmodel=medium" CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy
num_jobs_available: $(echo "$(grep -c processor /proc/cpuinfo)/4" | bc)
- test_flags: --storageEngine=inMemory,blacklist_from_ppc64le
- variant_excluded_flags: requires_persistence,requires_mmapv1,requires_journaling
+ test_flags: --storageEngine=inMemory
+ variant_excluded_flags: requires_persistence,requires_mmapv1,requires_journaling,blacklist_from_ppc64le
tooltags: "ssl sasl"
build_mongoreplay: true
tasks: