force ansible provisioning.

steenzout · steenzout · commit f76339cf8c9b · 2016-08-10T11:48:29.000-06:00
diff --git a/tests/vagrant.sh b/tests/vagrant.sh
@@ -3,7 +3,7 @@
 #
 # Bash script to run the test suite against the Vagrant environment.
 #
-# version: 1.2
+# version: 1.8
 #
 # usage:
 #
@@ -16,6 +16,12 @@
 #
 # changelog:
 #
+#   v1.8 : 10 August 2016
+#     - force provisioning
+#
+#   v1.6 : 10 Jun 2016
+#     - exit if USER environment variable is travis
+#
 #   v1.4 : 10 Jul 2015
 #     - remove environment variable ANSIBLE_ASK_SUDO_PASS
 #
@@ -24,6 +30,8 @@
 #
 # #################
 
+test $USER == 'travis' && exit 0
+
 DIR="$(dirname "$0")"
 
 cd $DIR
@@ -56,7 +64,7 @@ do
     if [ ! -n "${BOX+1}" ] || [ "${BOX}" = "${VAGRANT_BOX}" ]; then
 
         echo "[INFO] preparing ${VAGRANT_BOX}..."
-        vagrant up ${VAGRANT_BOX} 2> /dev/null
+        vagrant up --provision ${VAGRANT_BOX} 2> /dev/null
         if [ $? -ne 0 ]; then
             # box not enabled
             continue

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#`
`4`	`4`	`# Bash script to run the test suite against the Vagrant environment.`
`5`	`5`	`#`
`6`		`-# version: 1.2`
	`6`	`+# version: 1.8`
`7`	`7`	`#`
`8`	`8`	`# usage:`
`9`	`9`	`#`
`@@ -16,6 +16,12 @@`
`16`	`16`	`#`
`17`	`17`	`# changelog:`
`18`	`18`	`#`
	`19`	`+# v1.8 : 10 August 2016`
	`20`	`+# - force provisioning`
	`21`	`+#`
	`22`	`+# v1.6 : 10 Jun 2016`
	`23`	`+# - exit if USER environment variable is travis`
	`24`	`+#`
`19`	`25`	`# v1.4 : 10 Jul 2015`
`20`	`26`	`# - remove environment variable ANSIBLE_ASK_SUDO_PASS`
`21`	`27`	`#`
`@@ -24,6 +30,8 @@`
`24`	`30`	`#`
`25`	`31`	`# #################`
`26`	`32`
	`33`	`+test $USER == 'travis' && exit 0`
	`34`	`+`
`27`	`35`	`DIR="$(dirname "$0")"`
`28`	`36`
`29`	`37`	`cd $DIR`
`@@ -56,7 +64,7 @@ do`
`56`	`64`	`if [ ! -n "${BOX+1}" ] \|\| [ "${BOX}" = "${VAGRANT_BOX}" ]; then`
`57`	`65`
`58`	`66`	`echo "[INFO] preparing ${VAGRANT_BOX}..."`
`59`		`- vagrant up ${VAGRANT_BOX} 2> /dev/null`
	`67`	`+ vagrant up --provision ${VAGRANT_BOX} 2> /dev/null`
`60`	`68`	`if [ $? -ne 0 ]; then`
`61`	`69`	`# box not enabled`
`62`	`70`	`continue`