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

domodwyer · web-flow · commit 9b9ec8e1f0c5 · 2017-04-21T17:58:24.000+01:00
Run integration tests against MongoDB 3.2.12
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"

Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,12 @@ COMMONCOPTS="`
`37`	`37`	`$COMMONDOPTS`
`38`	`38`	`"`
`39`	`39`	`COMMONSOPTS="`
`40`		`- --chunkSize 1`
`41`	`40`	`--bind_ip=127.0.0.1`
`42`	`41`	`"`
`43`	`42`
`44`	`43`	`if versionAtLeast 3 2; then`
`45`	`44`	`# 3.2 doesn't like --nojournal on config servers.`
`46`		`- #COMMONCOPTS="$(echo "$COMMONCOPTS" \| sed '/--nojournal/d')"`
`47`		`- # Using a hacked version of MongoDB 3.2 for now.`
	`45`	`+ COMMONCOPTS="$(echo "$COMMONCOPTS" \| sed '/--nojournal/d')"`
`48`	`46`
`49`	`47`	`# Go back to MMAPv1 so it's not super sluggish. :-(`
`50`	`48`	`COMMONDOPTSNOIP="--storageEngine=mmapv1 $COMMONDOPTSNOIP"`