Fix macOS provisioning not shutting down cleanly
authorFrederik Gladhorn <frederik.gladhorn@qt.io>
Tue, 6 Dec 2016 17:59:10 +0000 (18:59 +0100)
committerSimon Hausmann <simon.hausmann@qt.io>
Wed, 7 Dec 2016 13:47:42 +0000 (13:47 +0000)
After provisioning we want the machine to be sensibly shut down since we
will use the disk image later. VSphere doesn't manage to shut down 10.8
VMs. Help out by calling shutdown.
For the other OS X/macOS versions, this is also desirable since
controlling the power state of these machines is hard with different
virtualization solutions (we're looking at OpenNebula/KVM).

Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh [new file with mode: 0644]
coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh [new file with mode: 0644]
coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh [new file with mode: 0644]
coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh [new file with mode: 0644]

diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.10-x86_64/999-shutdown.sh
new file mode 100644 (file)
index 0000000..1f17b54
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Make sure to shut down the machine cleanly when provisioning is done.
+
+# +1 minute delay to make sure that the setup finishes
+# and can clean up before being interrupted by the shutdown
+
+sudo shutdown -h +1
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.11-x86_64/999-shutdown.sh
new file mode 100644 (file)
index 0000000..1f17b54
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Make sure to shut down the machine cleanly when provisioning is done.
+
+# +1 minute delay to make sure that the setup finishes
+# and can clean up before being interrupted by the shutdown
+
+sudo shutdown -h +1
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.8-x86_64/999-shutdown.sh
new file mode 100644 (file)
index 0000000..73e5efa
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# OS X 10.8 and VMWare tools don't play well together.
+# The shutdown command fails, so just shut down the machine
+# manually when provisioning is done.
+
+# +1 minute delay to make sure that the setup finishes
+# and can clean up before being interrupted by the shutdown
+
+sudo shutdown -h +1
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh b/coin/provisioning/qtci-osx-10.9-x86_64/999-shutdown.sh
new file mode 100644 (file)
index 0000000..1f17b54
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Make sure to shut down the machine cleanly when provisioning is done.
+
+# +1 minute delay to make sure that the setup finishes
+# and can clean up before being interrupted by the shutdown
+
+sudo shutdown -h +1