Merge lp:~elopio/snappy/15.04_to_rolling-3 into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Added support for real updates before running the integration tests.

[lp:~elopio/snappy/15.04_to_rolling-3]

597. By Leo Arias on 2015-07-17

Moved the update tests to the latest package.

598. By Leo Arias on 2015-07-17

Renamed the latest package to cmd.

[Leo Arias (elopio)]

I'm not yet able to test this because of the ssh bug.

[Federico Gimenez (fgimenez)]

Great Leo, just a couple of nits inline and a question about reverting the si config when there's no update available, otherwise it's a +1. This will give us a lot of flexibility.

Thanks,

[lp:~elopio/snappy/15.04_to_rolling-3]

599. By Leo Arias on 2015-07-21

Added the isInRebootProcess method.

600. By Leo Arias on 2015-07-21

Use a map for the regex.

601. By Leo Arias on 2015-07-21

Moved the examples from run-checks to the README.

[Leo Arias (elopio)]

Thanks for the review Federico. I replied, and pushed. What should we do with this? Land or wait until ssh into the image if fixed?

[lp:~elopio/snappy/15.04_to_rolling-3]

602. By Leo Arias on 2015-07-21

Merged with trunk.

603. By Leo Arias on 2015-07-21

Renamed the packages.

[Federico Gimenez (fgimenez)]

Thanks, I'm ok with landing it already, we can fix any pending issues later.

Cheers!

review: Approve

=== modified file '_integration-tests/README.md'
--- _integration-tests/README.md	2015-07-15 07:37:35 +0000
+++ _integration-tests/README.md	2015-07-21 00:41:17 +0000
@@ -77,3 +77,22 @@
 Run the tests with:
 
     go run _integration-tests/main.go --ip {beaglebone-ip} --arch arm
+
+## Testing an update
+
+You can flash an old image, update to the latest and then run the whole suite
+on the updated system. The release, the channel and the revision flags specify
+the image that will be flashed, and the target-release and target-channel flags
+specify the values to be used in the update.
+
+For example, to update from rolling edge -1 to the latest and then run the
+integration tests:
+
+    go run _integration-tests/main.go --snappy-from-branch \
+    --revision=-1 --target-release=rolling --target-channel=edge
+
+To update from 15.04 edge to rolling edge and then run the integration tests:
+
+    go run _integration-tests/main.go --snappy-from-branch \
+    --release=15.04 --channel=edge \
+    --target-release=rolling --target-channel=edge
 
=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-07-17 15:43:11 +0000
+++ _integration-tests/main.go	2015-07-21 00:41:17 +0000
@@ -47,12 +47,10 @@
 )
 
 var (
-	commonSSHOptions   = []string{"---", "ssh"}
-	configFileName     = filepath.Join(dataOutputDir, "testconfig.json")
-	controlFile        = filepath.Join(dataOutputDir, "control")
-	testPackagesLatest = []string{"latest", "failover"}
-	testPackageUpdate  = []string{"update"}
-	testPackages       = append(testPackagesLatest, testPackageUpdate...)
+	commonSSHOptions = []string{"---", "ssh"}
+	configFileName   = filepath.Join(dataOutputDir, "testconfig.json")
+	controlFile      = filepath.Join(dataOutputDir, "control")
+	testPackages     = []string{"cmd", "failover"}
 )
 
 func buildAssets(useSnappyFromBranch bool, arch string) {
@@ -66,12 +64,18 @@
 	buildTests(arch)
 }
 
-func writeTestConfig(release, channel string) {
+func writeTestConfig(release, channel, targetRelease, targetChannel string) {
 	fmt.Println("Writing test config...")
 	testConfig := map[string]string{
 		"release": release,
 		"channel": channel,
 	}
+	if targetRelease != "" {
+		testConfig["targetRelease"] = targetRelease
+	}
+	if targetChannel != "" {
+		testConfig["targetChannel"] = targetChannel
+	}
 	fmt.Println(testConfig)
 	encoded, err := json.Marshal(testConfig)
 	if err != nil {
@@ -86,14 +90,6 @@
 		adtRun(rootPath, testFilter, testPackages,
 			kvmSSHOptions(imageName))
 	}
-
-	// Update from revision -1.
-	img.SetRevision("-1")
-	if imageName, err := img.UdfCreate(); err == nil {
-		adtRun(
-			rootPath, "updateSuite.TestUpdateToSameReleaseAndChannel",
-			testPackageUpdate, kvmSSHOptions(imageName))
-	}
 }
 
 func setupAndRunRemoteTests(rootPath, testFilter, testbedIP string, testbedPort int) {
@@ -220,6 +216,10 @@
 			"Channel of the image to be built, defaults to "+defaultChannel)
 		imgRevision = flag.String("revision", "",
 			"Revision of the image to be built (can be relative to the latest available revision in the given release and channel as in -1), defaults to the empty string")
+		targetRelease = flag.String("target-release", "",
+			"If specified, the image will be updated to this release before running the tests.")
+		targetChannel = flag.String("target-channel", "",
+			"If specified, the image will be updated to this channel before running the tests.")
 	)
 
 	flag.Parse()
@@ -232,7 +232,7 @@
 
 	// TODO: pass the config as arguments to the test binaries.
 	// --elopio - 2015-07-15
-	writeTestConfig(*imgRelease, *imgChannel)
+	writeTestConfig(*imgRelease, *imgChannel, *targetRelease, *targetChannel)
 
 	rootPath := getRootPath()
 
 
=== renamed directory '_integration-tests/tests/latest' => '_integration-tests/tests/cmd'
=== modified file '_integration-tests/tests/cmd/apt_test.go'
--- _integration-tests/tests/latest/apt_test.go	2015-07-17 00:02:32 +0000
+++ _integration-tests/tests/cmd/apt_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	. "../common"
 
=== modified file '_integration-tests/tests/cmd/base_test.go'
--- _integration-tests/tests/latest/base_test.go	2015-07-01 14:00:36 +0000
+++ _integration-tests/tests/cmd/base_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"testing"
 
=== modified file '_integration-tests/tests/cmd/build_test.go'
--- _integration-tests/tests/latest/build_test.go	2015-07-08 01:08:26 +0000
+++ _integration-tests/tests/cmd/build_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"fmt"
 
=== modified file '_integration-tests/tests/cmd/info_test.go'
--- _integration-tests/tests/latest/info_test.go	2015-07-15 15:18:22 +0000
+++ _integration-tests/tests/cmd/info_test.go	2015-07-21 00:41:17 +0000
@@ -17,12 +17,10 @@
  *
  */
 
-package latest
+package cmd
 
 import (
-	"encoding/json"
 	"fmt"
-	"io/ioutil"
 
 	. "../common"
 
@@ -35,24 +33,11 @@
 	SnappySuite
 }
 
-func readConfig(c *check.C) map[string]string {
-	b, err := ioutil.ReadFile("_integration-tests/data/output/testconfig.json")
-	c.Assert(
-		err, check.IsNil, check.Commentf("Failed to read test config: %v", err))
-
-	var decoded map[string]string
-	err = json.Unmarshal(b, &decoded)
-	c.Assert(
-		err, check.IsNil, check.Commentf("Failed to decode test config: %v", err))
-	return decoded
-}
-
 func (s *infoSuite) TestInfoMustPrintReleaseAndChannel(c *check.C) {
 	infoOutput := ExecCommand(c, "snappy", "info")
 
-	config := readConfig(c)
 	expected := "(?ms)" +
-		fmt.Sprintf("^release: ubuntu-core/%s/%s\n", config["release"], config["channel"]) +
+		fmt.Sprintf("^release: ubuntu-core/%s/%s\n", Config["release"], Config["channel"]) +
 		".*"
 
 	c.Assert(infoOutput, check.Matches, expected)
 
=== modified file '_integration-tests/tests/cmd/installApp_test.go'
--- _integration-tests/tests/latest/installApp_test.go	2015-07-15 05:36:24 +0000
+++ _integration-tests/tests/cmd/installApp_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"net/http"
 
=== modified file '_integration-tests/tests/cmd/installFramework_test.go'
--- _integration-tests/tests/latest/installFramework_test.go	2015-07-14 15:54:52 +0000
+++ _integration-tests/tests/cmd/installFramework_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"fmt"
 
=== modified file '_integration-tests/tests/cmd/list_test.go'
--- _integration-tests/tests/latest/list_test.go	2015-07-17 00:28:36 +0000
+++ _integration-tests/tests/cmd/list_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"fmt"
 
=== modified file '_integration-tests/tests/cmd/rollback_test.go'
--- _integration-tests/tests/latest/rollback_test.go	2015-07-17 04:21:07 +0000
+++ _integration-tests/tests/cmd/rollback_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"strconv"
 
=== modified file '_integration-tests/tests/cmd/search_test.go'
--- _integration-tests/tests/latest/search_test.go	2015-07-15 05:54:33 +0000
+++ _integration-tests/tests/cmd/search_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	. "../common"
 
=== renamed file '_integration-tests/tests/update/update_test.go' => '_integration-tests/tests/cmd/update_test.go'
--- _integration-tests/tests/update/update_test.go	2015-07-14 15:16:59 +0000
+++ _integration-tests/tests/cmd/update_test.go	2015-07-21 00:41:17 +0000
@@ -17,19 +17,14 @@
  *
  */
 
-package update
+package cmd
 
 import (
-	"testing"
-
 	. "../common"
-	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { TestingT(t) }
-
-var _ = Suite(&updateSuite{})
+var _ = check.Suite(&updateSuite{})
 
 type updateSuite struct {
 	SnappySuite
@@ -39,12 +34,13 @@
 // version. If there is no update available, the channel version will be
 // modified to fake an update. If there is a version available, the image will
 // be up-to-date after running this test.
-func (s *updateSuite) TestUpdateToSameReleaseAndChannel(c *C) {
+func (s *updateSuite) TestUpdateToSameReleaseAndChannel(c *check.C) {
 	if BeforeReboot() {
-		CallUpdate(c)
+		CallFakeUpdate(c)
 		Reboot(c)
 	} else if AfterReboot(c) {
 		RemoveRebootMark(c)
-		c.Assert(GetCurrentUbuntuCoreVersion(c) > GetSavedVersion(c), Equals, true)
+		c.Assert(GetCurrentUbuntuCoreVersion(c) > GetSavedVersion(c),
+			check.Equals, true)
 	}
 }
 
=== modified file '_integration-tests/tests/cmd/writablePaths_test.go'
--- _integration-tests/tests/latest/writablePaths_test.go	2015-07-17 16:16:03 +0000
+++ _integration-tests/tests/cmd/writablePaths_test.go	2015-07-21 00:41:17 +0000
@@ -17,7 +17,7 @@
  *
  */
 
-package latest
+package cmd
 
 import (
 	"bufio"
 
=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-17 04:21:07 +0000
+++ _integration-tests/tests/common/common.go	2015-07-21 00:41:17 +0000
@@ -20,6 +20,7 @@
 package common
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -39,6 +40,10 @@
 	channelCfgFile  = "/etc/system-image/channel.ini"
 )
 
+// Config is a map of strings that contains the configurations values passed
+// from the host to the testbed.
+var Config map[string]string
+
 // SnappySuite is a structure used as a base test suite for all the snappy
 // integration tests.
 type SnappySuite struct {
@@ -50,6 +55,22 @@
 func (s *SnappySuite) SetUpSuite(c *check.C) {
 	ExecCommand(c, "sudo", "systemctl", "stop", "snappy-autopilot.timer")
 	ExecCommand(c, "sudo", "systemctl", "disable", "snappy-autopilot.timer")
+	if !isInRebootProcess() {
+		Config = readConfig(c)
+		targetRelease, _ := Config["targetRelease"]
+		targetChannel, _ := Config["targetChannel"]
+		if targetRelease != "" || targetChannel != "" {
+			switchSystemImageConf(c, targetRelease, targetChannel, "0")
+			// Always use the installed snappy because we are updating from an old
+			// image, so we should not use the snappy from the branch.
+			output := ExecCommand(c, "sudo", "/usr/bin/snappy", "update")
+			if output != "" {
+				RebootWithMark(c, "setupsuite-update")
+			}
+		}
+	} else if CheckRebootMark("setupsuite-update") {
+		RemoveRebootMark(c)
+	}
 }
 
 // SetUpTest handles reboots and stores version information. It will run before
@@ -112,6 +133,47 @@
 	s.cleanupHandlers = append(s.cleanupHandlers, f)
 }
 
+func readConfig(c *check.C) map[string]string {
+	b, err := ioutil.ReadFile("_integration-tests/data/output/testconfig.json")
+	c.Assert(
+		err, check.IsNil, check.Commentf("Failed to read test config: %v", err))
+
+	var decoded map[string]string
+	err = json.Unmarshal(b, &decoded)
+	c.Assert(
+		err, check.IsNil, check.Commentf("Failed to decode test config: %v", err))
+	return decoded
+}
+
+func switchSystemImageConf(c *check.C, release, channel, version string) {
+	targets := []string{"/", BaseOtherPath}
+	for _, target := range targets {
+		file := filepath.Join(target, channelCfgFile)
+		if _, err := os.Stat(file); err == nil {
+			MakeWritable(c, target)
+			defer MakeReadonly(c, target)
+			replaceSystemImageValues(c, file, release, channel, version)
+		}
+	}
+}
+
+func replaceSystemImageValues(c *check.C, file, release, channel, version string) {
+	c.Log("Switching the system image conf...")
+	replaceRegex := map[string]string{
+		release: `s#channel: ubuntu-core/.*/\(.*\)#channel: ubuntu-core/%s/\1#`,
+		channel: `s#channel: ubuntu-core/\(.*\)/.*#channel: ubuntu-core/\1/%s#`,
+		version: `s/build_number: .*/build_number: %s/`,
+	}
+	for value, regex := range replaceRegex {
+		if value != "" {
+			ExecCommand(c,
+				"sudo", "sed", "-i", fmt.Sprintf(regex, value), file)
+		}
+	}
+	// Leave the new file in the test log.
+	ExecCommand(c, "cat", file)
+}
+
 func channelCfgBackupFile() string {
 	return filepath.Join(os.Getenv("ADT_ARTIFACTS"), "channel.ini")
 }
@@ -168,19 +230,6 @@
 	return version
 }
 
-// CallUpdate executes an snappy update. If there is no update available, the
-// channel version will be modified to fake an update.
-func CallUpdate(c *check.C) {
-	c.Log("Calling snappy update...")
-	output := ExecCommand(c, "sudo", "snappy", "update")
-	// XXX Instead of trying the update, we should have a command to tell us
-	// if there is an available update. --elopio - 2015-07-01
-	if output == "" {
-		c.Log("There is no update available.")
-		CallFakeUpdate(c)
-	}
-}
-
 // CallFakeUpdate calls snappy update after faking the current version
 func CallFakeUpdate(c *check.C) {
 	c.Log("Preparing fake and calling update.")
@@ -191,11 +240,11 @@
 func fakeAvailableUpdate(c *check.C) {
 	c.Log("Faking an available update...")
 	currentVersion := GetCurrentUbuntuCoreVersion(c)
-	switchChannelVersion(c, currentVersion, currentVersion-1)
+	switchChannelVersionWithBackup(c, currentVersion-1)
 	SetSavedVersion(c, currentVersion-1)
 }
 
-func switchChannelVersion(c *check.C, oldVersion, newVersion int) {
+func switchChannelVersionWithBackup(c *check.C, newVersion int) {
 	m := make(map[string]string)
 	m["/"] = channelCfgBackupFile()
 	m[BaseOtherPath] = channelCfgOtherBackupFile()
@@ -206,12 +255,7 @@
 			defer MakeReadonly(c, target)
 			// Back up the file. It will be restored during the test tear down.
 			ExecCommand(c, "cp", file, backup)
-			ExecCommand(c,
-				"sudo", "sed", "-i",
-				fmt.Sprintf(
-					"s/build_number: %d/build_number: %d/g",
-					oldVersion, newVersion),
-				file)
+			replaceSystemImageValues(c, file, "", "", strconv.Itoa(newVersion))
 		}
 	}
 }
@@ -263,6 +307,10 @@
 	return os.Getenv("ADT_REBOOT_MARK") == mark
 }
 
+func isInRebootProcess() bool {
+	return !CheckRebootMark("") || NeedsReboot()
+}
+
 // RemoveRebootMark removes the reboot mark to signal that the reboot has been
 // handled.
 func RemoveRebootMark(c *check.C) {
 
=== removed directory '_integration-tests/tests/update'
=== modified file 'run-checks'
--- run-checks	2015-07-08 15:50:31 +0000
+++ run-checks	2015-07-21 00:41:17 +0000
@@ -76,7 +76,7 @@
 
 # integration suite in kvm
 if which adt-run >/dev/null 2>&1; then
-    echo "Running integration tests"
+    echo "Running integration tests on rolling edge"
     go run _integration-tests/main.go --snappy-from-branch
 fi