Improve and test install and upgrade robustness

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

tests/upgrade_test.go

@@ -2,28 +2,72 @@ package integration
 
 import (
 	"fmt"
+	"time"
+
+	"strings"
 
 	. "gopkg.in/check.v1"
 )
 
-// DisabledTestUpgrade, The new go based installer code breaks downgrading from itself to a previous version
-// because 0.8.0 now uses syslinx and a set of syslinux.cfg files, whereas before that , we used grub and
-// assumed that there was only one kernel&initrd
-//      see installer_test.go for more tests
-func (s *QemuSuite) DisabledTestUpgrade(c *C) {
-	s.RunQemuInstalled(c)
-
-	s.CheckCall(c, `
-set -ex
-sudo ros os upgrade -i rancher/os:v0.5.0 --force --no-reboot`)
-
-	s.Reboot(c)
-
-	s.CheckCall(c, "sudo ros -v | grep v0.5.0")
-	s.LoadInstallerImage(c)
-	s.CheckCall(c, fmt.Sprintf("sudo ros os upgrade -i rancher/os:%s%s --force --no-reboot", Version, Suffix))
-
-	s.Reboot(c)
-
-	s.CheckCall(c, fmt.Sprintf("sudo ros -v | grep %s", Version))
+func (s *QemuSuite) TestUpgrade050(c *C) {
+	s.commonTestCode(c, "v0.5.0", "debian")
+}
+func (s *QemuSuite) TestUpgrade070(c *C) {
+	s.commonTestCode(c, "v0.7.0", "default")
+}
+func (s *QemuSuite) TestUpgrade071(c *C) {
+	s.commonTestCode(c, "v0.7.1", "ubuntu")
+}
+func (s *QemuSuite) TestUpgrade080rc1(c *C) {
+	s.commonTestCode(c, "v0.8.0-rc1", "alpine")
+}
+func (s *QemuSuite) TestUpgrade080rc7(c *C) {
+	s.commonTestCode(c, "v0.8.0-rc7", "centos")
+}
+
+func (s *QemuSuite) commonTestCode(c *C, startWithVersion, console string) {
+	runArgs := []string{
+		"--iso",
+		"--fresh",
+		"--cloud-config",
+		"./tests/assets/test_12/cloud-config.yml",
+	}
+	version := ""
+	{
+		s.RunQemuWith(c, runArgs...)
+		version = s.CheckOutput(c, version, Not(Equals), "sudo ros -v")
+		version = strings.TrimSpace(strings.TrimPrefix(version, "ros version"))
+		c.Assert(Version, Equals, version)
+
+		fmt.Printf("installing %s", startWithVersion)
+		s.PullAndLoadInstallerImage(c, startWithVersion)
+
+		s.CheckCall(c, fmt.Sprintf(`
+echo "---------------------------------- generic"
+set -ex
+echo "ssh_authorized_keys:" > config.yml
+echo "  - $(cat /home/rancher/.ssh/authorized_keys)" >> config.yml
+sudo ros install --force --no-reboot --device /dev/vda -c config.yml --append rancher.password=rancher -i rancher/os:%s
+sudo ros console enable %s
+sync
+		`, startWithVersion, console))
+		time.Sleep(500 * time.Millisecond)
+		s.Stop(c)
+	}
+
+	// ./scripts/run --no-format --append "rancher.debug=true"
+	runArgs = []string{
+		"--boothd",
+	}
+	s.RunQemuWith(c, runArgs...)
+
+	s.CheckOutput(c, "ros version "+startWithVersion+"\n", Equals, "sudo ros -v")
+
+	s.LoadInstallerImage(c)
+	s.CheckCall(c, fmt.Sprintf("sudo ros os upgrade --no-reboot -i rancher/os:%s%s --force", Version, Suffix))
+
+	s.Reboot(c)
+	s.CheckOutput(c, "ros version "+Version+"\n", Equals, "sudo ros -v")
+
+	s.Stop(c)
 }