Merge lp:~elopio/snappy/real_rollback into lp:~snappy-dev/snappy/snappy-moved-to-github

[Leo Arias]

Added support for real rollbacks before running the integration tests.

[Federico Gimenez (fgimenez)]

LGTM, two inline comments, thanks!

review: Approve

[Leo Arias (elopio)]

thanks for the review. Working on it.

[Leo Arias (elopio)]

Please check again Federico.

[Federico Gimenez (fgimenez)]

Great Leo :) thanks!

=== modified file '_integration-tests/README.md'
--- _integration-tests/README.md	2015-07-21 00:38:12 +0000
+++ _integration-tests/README.md	2015-07-22 15:12:38 +0000
@@ -80,19 +80,32 @@
 
 ## 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.
+With the --update flag 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 if they are different from the flashed values.
 
 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
+    --revision=-1 --update
 
-To update from 15.04 edge to rolling edge and then run the integration tests:
+To update from 15.04 alpha 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
+    --release=15.04 --channel=alpha \
+    --update --target-release=rolling --target-channel=edge
+
+## Testing a rollback
+
+With the --rollback flag you can flash an old image, update to the latest,
+rollback again to the old image and then run the whole suite on the rolled
+back system. You should use the release, channel, revision, target-release and
+target-channel flags as when testing an update.
+
+For example, to test a rollback from latest rolling edge to rolling edge -1:
+
+    go run _integration-tests/main.go \
+    --revision=-1 --rollback

=== added directory '_integration-tests/config'
=== added file '_integration-tests/config/config.go'
--- _integration-tests/config/config.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/config/config.go	2015-07-22 15:12:38 +0000
@@ -0,0 +1,74 @@
+// -*- Mode: Go; indent-tabs-mode: t -*-
+
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package config
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"strconv"
+)
+
+// Config contains the values to pass to the test bed from the host.
+type Config struct {
+	fileName      string
+	release       string
+	channel       string
+	targetRelease string
+	targetChannel string
+	update        bool
+	rollback      bool
+}
+
+// NewConfig is the Config constructor
+func NewConfig(fileName, release, channel, targetRelease, targetChannel string, update, rollback bool) *Config {
+	return &Config{
+		fileName: fileName, release: release, channel: channel,
+		targetRelease: targetRelease, targetChannel: targetChannel,
+		update: update, rollback: rollback,
+	}
+}
+
+// Write writes the config to a file that will be copied to the test bed.
+func (cfg Config) Write() {
+	fmt.Println("Writing test config...")
+	testConfig := map[string]string{
+		"release": cfg.release,
+		"channel": cfg.channel,
+	}
+	if cfg.targetRelease != "" {
+		testConfig["targetRelease"] = cfg.targetRelease
+	}
+	if cfg.targetChannel != "" {
+		testConfig["targetChannel"] = cfg.targetChannel
+	}
+	testConfig["update"] = strconv.FormatBool(cfg.update)
+	testConfig["rollback"] = strconv.FormatBool(cfg.rollback)
+	fmt.Println(testConfig)
+	encoded, err := json.Marshal(testConfig)
+	if err != nil {
+		log.Fatalf("Error encoding the test config: %v", err)
+	}
+	err = ioutil.WriteFile(cfg.fileName, encoded, 0644)
+	if err != nil {
+		log.Fatalf("Error writing the test config: %v", err)
+	}
+}

=== modified file '_integration-tests/image/image.go'
--- _integration-tests/image/image.go	2015-07-15 14:39:42 +0000
+++ _integration-tests/image/image.go	2015-07-22 15:12:38 +0000
@@ -27,7 +27,7 @@
 	utils "../utils"
 )
 
-// Image type encapsulate image actions
+// Image type encapsulates image actions
 type Image struct {
 	release  string
 	channel  string

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-07-21 00:40:00 +0000
+++ _integration-tests/main.go	2015-07-22 15:12:38 +0000
@@ -20,10 +20,8 @@
 package main
 
 import (
-	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -31,6 +29,7 @@
 	"strings"
 	"text/template"
 
+	config "./config"
 	image "./image"
 	utils "./utils"
 )
@@ -64,26 +63,6 @@
 	buildTests(arch)
 }
 
-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 {
-		log.Fatalf("Error encoding the test config: %v", testConfig)
-	}
-	ioutil.WriteFile(configFileName, encoded, 0644)
-}
-
 func setupAndRunLocalTests(rootPath, testFilter string, img image.Image) {
 	// Run the tests on the latest rolling edge image.
 	if imageName, err := img.UdfCreate(); err == nil {
@@ -216,10 +195,14 @@
 			"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")
+		update = flag.Bool("update", false,
+			"If this flag is used, the image will be updated before running the tests.")
 		targetRelease = flag.String("target-release", "",
-			"If specified, the image will be updated to this release before running the tests.")
+			"If the update flag is used, 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.")
+			"If the update flag is used, the image will be updated to this channel before running the tests.")
+		rollback = flag.Bool("rollback", false,
+			"If this flag is used, the image will be updated and then rolled back before running the tests.")
 	)
 
 	flag.Parse()
@@ -232,7 +215,10 @@
 
 	// TODO: pass the config as arguments to the test binaries.
 	// --elopio - 2015-07-15
-	writeTestConfig(*imgRelease, *imgChannel, *targetRelease, *targetChannel)
+	cfg := config.NewConfig(
+		configFileName, *imgRelease, *imgChannel, *targetRelease, *targetChannel,
+		*update, *rollback)
+	cfg.Write()
 
 	rootPath := getRootPath()
 

=== modified file '_integration-tests/tests/common/common.go'
--- _integration-tests/tests/common/common.go	2015-07-21 00:40:00 +0000
+++ _integration-tests/tests/common/common.go	2015-07-22 15:12:38 +0000
@@ -57,10 +57,8 @@
 	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")
+		if Config["update"] == "true" || Config["rollback"] == "true" {
+			switchSystemImageConf(c, Config["targetRelease"], Config["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")
@@ -70,6 +68,12 @@
 		}
 	} else if CheckRebootMark("setupsuite-update") {
 		RemoveRebootMark(c)
+		if Config["rollback"] == "true" {
+			ExecCommand(c, "sudo", "snappy", "rollback", "ubuntu-core")
+			RebootWithMark(c, "setupsuite-rollback")
+		}
+	} else if CheckRebootMark("setupsuite-rollback") {
+		RemoveRebootMark(c)
 	}
 }