Merge lp:~elopio/snappy/remote-ssh into lp:~fgimenez/snappy/cross-compile-debs

[Leo Arias]

Got the remote ssh working.

Tests now can run in an running local kvm:
go run _integration-tests/main.go --ip localhost --port 8022

or in a remote beaglebone:
go run _integration-tests/main.go --installed-image --ip 192.168.2.196

Most of the test will fail because the images we prepare for kvm and beagle don't meet the prerequisites of the tests.

[lp:~elopio/snappy/remote-ssh]

513. By Leo Arias on 2015-06-24

Also got the crossbuild working. It fails, but starts.

514. By Leo Arias on 2015-06-24

If we are using 15.04, that is vivid.

[Federico Gimenez (fgimenez)]

Great, thanks!

review: Approve

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-06-19 09:02:08 +0000
+++ _integration-tests/main.go	2015-06-24 06:26:44 +0000
@@ -7,6 +7,7 @@
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 )
 
 const (
@@ -15,6 +16,7 @@
 	defaultRelease  = "15.04"
 	defaultChannel  = "edge"
 	defaultArch     = "amd64"
+	defaultSSHPort  = 22
 )
 
 var (
@@ -28,17 +30,23 @@
 		[]string{
 			"-s", "/usr/share/autopkgtest/ssh-setup/snappy",
 			"--", "-i", imageTarget}...)
-	useFlashedImage bool
-	debsDir         string
-	arch            string
-	testbedIP       string
 )
 
-func init() {
-	flag.BoolVar(&useFlashedImage, "installed-image", false, "Wether we should install the snappy version from the branch or use the one installed on the image")
-	flag.StringVar(&debsDir, "debs-dir", defaultDebsDir, "Directory with the snappy debian packages.")
-	flag.StringVar(&arch, "arch", defaultArch, "Target architecture (amd64, armhf)")
-	flag.StringVar(&testbedIP, "ip", "", "IP of the testbed to run the tests in")
+func setupAndRunTests(useFlashedImage bool, debsDir, arch, testbedIP string, testbedPort int) {
+	rootPath := getRootPath()
+	if useFlashedImage {
+		// using the flashed image, so no debs must be installed.
+		debsDir = ""
+	} else if debsDir == defaultDebsDir {
+		buildDebs(rootPath, debsDir, arch)
+	}
+	if testbedIP == "" {
+		createImage(defaultRelease, defaultChannel, getArchForImage())
+		adtRun(rootPath, debsDir, kvmSSHOptions)
+	} else {
+		execCommand("ssh-copy-id", "-p", strconv.Itoa(testbedPort), "ubuntu@"+testbedIP)
+		adtRun(rootPath, debsDir, remoteTestbedSSHOptions(testbedIP, testbedPort))
+	}
 }
 
 func execCommand(cmds ...string) {
@@ -50,18 +58,18 @@
 	}
 }
 
-func buildDebs(rootPath, arch string) {
+func buildDebs(rootPath, destDir, arch string) {
 	fmt.Println("Building debs...")
-	prepareTargetDir(debsDir)
-	buildCommand := []string{"bzr", "bd",
-		fmt.Sprintf("--result-dir=%s", debsDir),
+	prepareTargetDir(destDir)
+	buildCommand := []string{"bzr", "bd", "-v",
+		fmt.Sprintf("--result-dir=%s", destDir),
 		"--split",
 		rootPath,
 	}
 	if arch != defaultArch {
 		builderOption := []string{
-			fmt.Sprintf(
-				"--builder=sbuild --build amd64 --host %s --dist wily", arch)}
+			"--builder=sbuild", "--",
+			fmt.Sprintf("--host=%s", arch), "--dist=vivid", "-v"}
 		buildCommand = append(buildCommand, builderOption...)
 	} else {
 		dontSignDebs := []string{"--", "-uc", "-us"}
@@ -83,7 +91,7 @@
 		"--developer-mode")
 }
 
-func adtRun(rootPath string, testbedOptions []string) {
+func adtRun(rootPath, debsDir string, testbedOptions []string) {
 	fmt.Println("Calling adt-run...")
 	prepareTargetDir(outputDir)
 	cmd := []string{
@@ -92,7 +100,7 @@
 		"--built-tree", rootPath,
 		"--output-dir", outputDir}
 
-	if !useFlashedImage {
+	if debsDir != "" {
 		debsSetup := []string{
 			"--setup-commands", "touch /run/autopkgtest_no_reboot.stamp",
 			"--setup-commands", "mount -o remount,rw /",
@@ -107,9 +115,10 @@
 	execCommand(append(cmd, testbedOptions...)...)
 }
 
-func remoteTestbedSSHOptions(testbedIP string) []string {
+func remoteTestbedSSHOptions(testbedIP string, testbedPort int) []string {
 	options := []string{
 		"-H", testbedIP,
+		"-p", strconv.Itoa(testbedPort),
 		"-l", "ubuntu",
 		"-i", filepath.Join(os.Getenv("HOME"), ".ssh", "id_rsa")}
 	return append(commonSSHOptions, options...)
@@ -136,18 +145,20 @@
 }
 
 func main() {
+	var (
+		useFlashedImage = flag.Bool("installed-image", false,
+			"Wether we should install the snappy version from the branch or use the one installed on the image")
+		debsDir = flag.String("debs-dir", defaultDebsDir,
+			"Directory with th1e snappy debian packages.")
+		arch = flag.String("arch", defaultArch,
+			"Target architecture (amd64, armhf)")
+		testbedIP = flag.String("ip", "",
+			"IP of the testbed to run the tests in")
+		testbedPort = flag.Int("port", defaultSSHPort,
+			"SSH port of the testbed")
+	)
+
 	flag.Parse()
 
-	rootPath := getRootPath()
-
-	if !useFlashedImage && debsDir == defaultDebsDir {
-		buildDebs(rootPath, arch)
-	}
-	if testbedIP == "" {
-		createImage(defaultRelease, defaultChannel, getArchForImage())
-		adtRun(rootPath, kvmSSHOptions)
-	} else {
-		execCommand("ssh-copy-id", "ubuntu@"+testbedIP)
-		adtRun(rootPath, remoteTestbedSSHOptions(testbedIP))
-	}
+	setupAndRunTests(*useFlashedImage, *debsDir, *arch, *testbedIP, *testbedPort)
 }