Merge lp:~fgimenez/snappy/1504_validation into lp:~snappy-dev/snappy/snappy-moved-to-github

[Federico Gimenez]

15.04 validation changes

15.04 validation changes, compatible with rolling too

[Leo Arias (elopio)]

I made these extra changes and could run successfully on 15.04 alpha #11.

http://paste.ubuntu.com/12432357/

[Leo Arias (elopio)]

One more patch, to allow the execution on --update:
http://paste.ubuntu.com/12433452/

[lp:~fgimenez/snappy/1504_validation]

686. By Federico Gimenez on 2015-09-21

removed change to script in prerequesite

[Leo Arias (elopio)]

The prerequisite is proving harder than expected. So, we should merge the changes we can without that one.

[Leo Arias (elopio)]

Here's one https://code.launchpad.net/~elopio/snappy/unexisting/+merge/271896

[Leo Arias (elopio)]

Here's two https://code.launchpad.net/~elopio/snappy/new_kernel_file_name/+merge/271901

[Leo Arias (elopio)]

Here's a problem: https://bugs.launchpad.net/snappy/+bug/1498293

[Leo Arias (elopio)]

Here's three https://code.launchpad.net/~elopio/snappy/test-install_app_origin/+merge/272306

[Leo Arias (elopio)]

Here's four https://code.launchpad.net/~elopio/snappy/skip_fan/+merge/272312

[Leo Arias (elopio)]

Here's five https://code.launchpad.net/~elopio/snappy/fix_integration_cfg/+merge/272332

And I think we are done. The only remaining problem is the rollback.
The new kernel file branch needs some more stressing, because I think I saw it happening again at some point today. But I've touched too many branches, not sure about what I saw.

[Federico Gimenez (fgimenez)]

Thanks for bringing order to this mess :) I'll try the rollback now.

Unmerged revisions

686. By Federico Gimenez on 2015-09-21

removed change to script in prerequesite

685. By Federico Gimenez on 2015-09-18

merged trunk

684. By Federico Gimenez on 2015-09-18

no need for taking into account for old kernel files after the unified approach

683. By Federico Gimenez on 2015-09-17

Added patches from elopio

682. By Federico Gimenez on 2015-09-16

fixed try mode

681. By Federico Gimenez on 2015-09-16

more fixes

680. By Federico Gimenez on 2015-09-16

merged trunk

679. By Federico Gimenez on 2015-09-16

unified boot file paths for grub and uboot

678. By Federico Gimenez on 2015-09-15

merged resize_test2

677. By Federico Gimenez on 2015-09-15

merged elopio's resize_test

=== modified file '_integration-tests/tests/failover_zero_size_file_test.go'
--- _integration-tests/tests/failover_zero_size_file_test.go	2015-09-13 02:52:52 +0000
+++ _integration-tests/tests/failover_zero_size_file_test.go	2015-09-21 08:34:11 +0000
@@ -53,29 +53,23 @@
 }
 
 func (zeroSizeInitrd) set(c *check.C) {
-	if classicKernelFiles(c) {
-		commonSet(c, BaseAltPartitionPath, origBootFilenamePattern, initrdFilename)
-	} else {
-		boot, err := partition.BootSystem()
-		c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
-		dir := partition.BootDir(boot)
-
-		bootFileNamePattern := newKernelFilenamePattern(c, boot, true)
-		commonSet(c, dir, bootFileNamePattern, initrdFilename)
-	}
+	boot, err := partition.BootSystem()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
+	dir := partition.BootDir(boot)
+
+	bootFileNamePattern := newKernelFilenamePattern(c, boot, true)
+	commonSet(c, dir, bootFileNamePattern, initrdFilename)
+
 }
 
 func (zeroSizeInitrd) unset(c *check.C) {
-	if classicKernelFiles(c) {
-		commonUnset(c, BaseAltPartitionPath, origBootFilenamePattern, initrdFilename)
-	} else {
-		boot, err := partition.BootSystem()
-		c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
-		dir := partition.BootDir(boot)
-
-		bootFileNamePattern := newKernelFilenamePattern(c, boot, false)
-		commonUnset(c, dir, bootFileNamePattern, initrdFilename)
-	}
+	boot, err := partition.BootSystem()
+	c.Assert(err, check.IsNil, check.Commentf("Error getting the boot system: %s", err))
+	dir := partition.BootDir(boot)
+
+	bootFileNamePattern := newKernelFilenamePattern(c, boot, false)
+	commonUnset(c, dir, bootFileNamePattern, initrdFilename)
+
 }
 
 func (zeroSizeSystemd) set(c *check.C) {
@@ -144,15 +138,6 @@
 	return matches[0]
 }
 
-func classicKernelFiles(c *check.C) bool {
-	initrdClassicFilenamePattern := fmt.Sprintf("/boot/%s*-generic", initrdFilename)
-	matches, err := filepath.Glob(initrdClassicFilenamePattern)
-
-	c.Assert(err, check.IsNil, check.Commentf("Error: %v", err))
-
-	return len(matches) == 1
-}
-
 // newKernelFilenamePattern returns the filename pattern to modify files
 // in the partition declared in the boot config file.
 //
@@ -162,15 +147,17 @@
 // If we are not in an update process (ie. we are unsetting the failover conditions)
 // we want to change the files in the other partition
 func newKernelFilenamePattern(c *check.C, bootSystem string, afterUpdate bool) string {
-	var actualPartition string
-	part, err := partition.NextBootPartition()
-	c.Assert(err, check.IsNil, check.Commentf("Error getting the current partition: %s", err))
+	var part string
+	var err error
 	if afterUpdate {
-		actualPartition = part
+		part, err = partition.NextBootPartition()
+		c.Assert(err, check.IsNil, check.Commentf("Error getting the next boot partition: %s", err))
 	} else {
-		actualPartition = partition.OtherPartition(part)
+		part, err = partition.CurrentPartition()
+		c.Assert(err, check.IsNil, check.Commentf("Error getting the current partition: %s", err))		
+		part = partition.OtherPartition(part)
 	}
-	return filepath.Join(actualPartition, "%s%s*")
+	return filepath.Join(part, "%s%s*")
 }
 
 /*

=== modified file '_integration-tests/tests/installApp_test.go'
--- _integration-tests/tests/installApp_test.go	2015-09-04 07:41:30 +0000
+++ _integration-tests/tests/installApp_test.go	2015-09-21 08:34:11 +0000
@@ -119,5 +119,5 @@
 	c.Assert(err, check.NotNil)
 	c.Assert(string(output), check.Equals,
 		"Installing unexisting.canonical\n"+
-			"unexisting.canonical failed to install: snappy package not found\n")
+			"unexisting failed to install: snappy package not found\n")
 }

=== modified file '_integration-tests/tests/ubuntuFan_test.go'
--- _integration-tests/tests/ubuntuFan_test.go	2015-09-10 10:15:43 +0000
+++ _integration-tests/tests/ubuntuFan_test.go	2015-09-21 08:34:11 +0000
@@ -26,6 +26,7 @@
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/config"
 	"launchpad.net/snappy/_integration-tests/testutils/wait"
 
 	"gopkg.in/check.v1"
@@ -45,8 +46,14 @@
 }
 
 func (s *fanTestSuite) SetUpTest(c *check.C) {
+	var err error
+	Cfg, err := config.ReadConfig(
+		"_integration-tests/data/output/testconfig.json")
+	if Cfg.Release == "15.04" {
+		c.Skip("Ubuntu Fan not available in 15.04")
+	}
+
 	s.SnappySuite.SetUpTest(c)
-	var err error
 	s.subjectIP, err = getIPAddr(c)
 	c.Assert(err, check.IsNil)
 

=== modified file '_integration-tests/tests/update_test.go'
--- _integration-tests/tests/update_test.go	2015-09-10 15:55:23 +0000
+++ _integration-tests/tests/update_test.go	2015-09-21 08:34:11 +0000
@@ -24,6 +24,7 @@
 	"path"
 
 	. "launchpad.net/snappy/_integration-tests/testutils/common"
+	"launchpad.net/snappy/_integration-tests/testutils/config"
 	"launchpad.net/snappy/_integration-tests/testutils/partition"
 
 	"gopkg.in/check.v1"
@@ -68,7 +69,11 @@
 			".*" +
 			"^Reboot to use .*ubuntu-core.\n"
 		c.Assert(updateOutput, check.Matches, expected)
-		s.assertBootDirContents(c)
+		cfg, err := config.ReadConfig("_integration-tests/data/output/testconfig.json")
+		c.Assert(err, check.IsNil)
+		if cfg.Release != "15.04" {
+			s.assertBootDirContents(c)
+		}
 		Reboot(c)
 	} else if AfterReboot(c) {
 		RemoveRebootMark(c)

=== modified file '_integration-tests/testutils/common/common.go'
--- _integration-tests/testutils/common/common.go	2015-09-03 10:46:21 +0000
+++ _integration-tests/testutils/common/common.go	2015-09-21 08:34:11 +0000
@@ -56,11 +56,12 @@
 func (s *SnappySuite) SetUpSuite(c *check.C) {
 	ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
 	ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
+	var err error
+	Cfg, err = config.ReadConfig(
+			"_integration-tests/data/output/testconfig.json")
+	c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
+	
 	if !isInRebootProcess() {
-		var err error
-		Cfg, err = config.ReadConfig(
-			"_integration-tests/data/output/testconfig.json")
-		c.Assert(err, check.IsNil, check.Commentf("Error reading config: %v", err))
 		if Cfg.Update || Cfg.Rollback {
 			switchSystemImageConf(c, Cfg.TargetRelease, Cfg.TargetChannel, "0")
 			// Always use the installed snappy because we are updating from an old
@@ -72,12 +73,16 @@
 		}
 	} else if CheckRebootMark("setupsuite-update") {
 		RemoveRebootMark(c)
+		Cfg.Update = false
+		Cfg.Write()
 		if Cfg.Rollback {
 			ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core")
 			RebootWithMark(c, "setupsuite-rollback")
 		}
 	} else if CheckRebootMark("setupsuite-rollback") {
 		RemoveRebootMark(c)
+		Cfg.Rollback = false
+		Cfg.Write()
 	}
 }
 
@@ -230,7 +235,10 @@
 func CallFakeUpdate(c *check.C) string {
 	c.Log("Preparing fake and calling update.")
 	fakeAvailableUpdate(c)
-	return ExecCommand(c, "sudo", "snappy", "update")
+	// Discarding the error until https://bugs.launchpad.net/snappy/+bug/1477657
+	// is fixed (fgimenez 20150916)
+	out, _ := exec.Command("sudo", "snappy", "update").Output()
+	return string(out)
 }
 
 func fakeAvailableUpdate(c *check.C) {