summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Kleinman <samk@10gen.com>2016-08-22 15:02:29 -0400
committerSam Kleinman <samk@10gen.com>2016-08-22 15:02:29 -0400
commitadc0df4ccce9d4d1ed9e723e1101134f816a67b4 (patch)
treea1bbb3f7314a86baecf538d5795add085b298719
parent603ab9c1347c1cb1bd5455e1a5808cf9e45a6477 (diff)
downloadmongo-adc0df4ccce9d4d1ed9e723e1101134f816a67b4.tar.gz
SERVER-24442: cleanup evergreen configuration around cleanup
-rw-r--r--etc/evergreen.yml42
1 files changed, 11 insertions, 31 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 1889b574b7a..391497944b0 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -96,31 +96,6 @@ variables:
- osx-107
-- &packaging_variants
- - enterprise-linux-64-amazon-ami
- - enterprise-rhel-57-64-bit
- - enterprise-rhel-62-64-bit
- - enterprise-rhel-70-64-bit
- - enterprise-rhel-71-ppc64le
- - enterprise-suse11-64
- - enterprise-suse12-64
- - enterprise-ubuntu1204-64
- - enterprise-ubuntu1404-64
- - enterprise-ubuntu1604-64
- - enterprise-debian71-64
- - enterprise-debian81-64
- - rhel55
- - rhel62
- - rhel70
- - suse11
- - suse12
- - ubuntu1204
- - ubuntu1404
- - ubuntu1604
- - amazon
- - debian71
- - debian81
-
#######################################
# Functions #
#######################################
@@ -399,6 +374,15 @@ functions:
rm -rf /data/install /data/multiversion
${python|python} buildscripts/setup_multiversion_mongodb.py /data/install /data/multiversion ${multiversion_platform_arch|"Linux/x86_64"} "3.3.10"
+ "cleanup environment" :
+ command: shell.exec
+ params:
+ script: |
+ set -o errexit
+ set -o verbose
+
+ rm -rf src /data/db/* mongo-coredumps.tgz ~/.aws
+
pre:
- command: shell.track
- command: shell.exec
@@ -412,7 +396,7 @@ pre:
set -o errexit
set -o verbose
- rm -rf src /data/db/* mongo-coredumps.tgz
+ - func: "cleanup environment"
- command: expansions.update
params:
updates:
@@ -510,11 +494,7 @@ post:
else
echo "No OOM (Out of memory) killed processes detected"
fi
- - command: shell.exec
- params:
- script: |
- rm -rf ~/.aws
- - command: shell.cleanup
+ - func: "cleanup environment"
timeout:
- command: shell.exec