Merge pull request globalsign#4 from globalsign/feature/mongo-3.2.12-…

…integration-tests Run integration tests against MongoDB 3.2.12
libi · Apr 21, 2017 · 9b9ec8e · 9b9ec8e
2 parents 0e457ba + 96b85de
commit 9b9ec8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,9 @@ env:
         - GO=1.6   MONGODB=x86_64-3.2.3-nojournal
         - GO=1.7   MONGODB=x86_64-3.2.3-nojournal
         - GO=1.8.x MONGODB=x86_64-3.2.3-nojournal
+        - GO=1.6   MONGODB=x86_64-3.2.12
+        - GO=1.7   MONGODB=x86_64-3.2.12
+        - GO=1.8.x MONGODB=x86_64-3.2.12
 
 install:
     - eval "$(gimme $GO)"

diff --git a/harness/daemons/.env b/harness/daemons/.env
@@ -37,14 +37,12 @@ COMMONCOPTS="
 	$COMMONDOPTS
 	"
 COMMONSOPTS="
-	--chunkSize 1
 	--bind_ip=127.0.0.1
 	"
 
 if versionAtLeast 3 2; then
 	# 3.2 doesn't like --nojournal on config servers.
-	#COMMONCOPTS="$(echo "$COMMONCOPTS" | sed '/--nojournal/d')"
-	# Using a hacked version of MongoDB 3.2 for now.
+	COMMONCOPTS="$(echo "$COMMONCOPTS" | sed '/--nojournal/d')"
 
 	# Go back to MMAPv1 so it's not super sluggish. :-(
 	COMMONDOPTSNOIP="--storageEngine=mmapv1 $COMMONDOPTSNOIP"