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

[Leo Arias]

Moved the integration build helpers to a package.

[Leo Arias (elopio)]

I don't like the name "Assets", but I can't think of a better name. "Binaries" it's almost the same.
Maybe we can rename it to build.SnappyAndIntegraionTests. Or maybe we just split it and call it twice:

build.Snappy()
build.IntegrationTests()

[Federico Gimenez (fgimenez)]

I'm fine with Assets, mostly because of the common creation of the target directory, +1 for me.

As a nit maybe we could include the goCall method in the build package until it is used elsewhere.

Cheers!

review: Approve

[lp:~elopio/snappy/extract_integration_build]

614. By Leo Arias on 2015-07-28

Moved the goCall back to build.go.

615. By Leo Arias on 2015-07-28

Fixed goCall.

[Leo Arias (elopio)]

> As a nit maybe we could include the goCall method in the build package until
> it is used elsewhere.

Done!

=== added directory '_integration-tests/helpers/build'
=== added file '_integration-tests/helpers/build/build.go'
--- _integration-tests/helpers/build/build.go	1970-01-01 00:00:00 +0000
+++ _integration-tests/helpers/build/build.go	2015-07-28 12:05:32 +0000
@@ -0,0 +1,76 @@
+// -*- 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 build
+
+import (
+	"fmt"
+	"os"
+
+	"launchpad.net/snappy/_integration-tests/helpers/utils"
+)
+
+const (
+	// IntegrationTestName is the name of the test binary.
+	IntegrationTestName = "integration.test"
+	defaultGoArm        = "7"
+	testsBinDir         = "_integration-tests/bin/"
+)
+
+// Assets builds the snappy and integration tests binaries for the target
+// architecture.
+func Assets(useSnappyFromBranch bool, arch string) {
+	utils.PrepareTargetDir(testsBinDir)
+
+	if useSnappyFromBranch {
+		// FIXME We need to build an image that has the snappy from the branch
+		// installed. --elopio - 2015-06-25.
+		buildSnappyCLI(arch)
+	}
+	buildTests(arch)
+}
+
+func buildSnappyCLI(arch string) {
+	fmt.Println("Building snappy CLI...")
+	// On the root of the project we have a directory called snappy, so we
+	// output the binary for the tests in the tests directory.
+	goCall(arch, "build", "-o", testsBinDir+"snappy", "./cmd/snappy")
+}
+
+func buildTests(arch string) {
+	fmt.Println("Building tests...")
+
+	goCall(arch, "test", "-c", "./_integration-tests/tests")
+	// XXX Go test 1.3 does not have the output flag, so we move the
+	// binaries after they are generated.
+	os.Rename("tests.test", testsBinDir+IntegrationTestName)
+}
+
+func goCall(arch string, cmds ...string) {
+	if arch != "" {
+		defer os.Setenv("GOARCH", os.Getenv("GOARCH"))
+		os.Setenv("GOARCH", arch)
+		if arch == "arm" {
+			defer os.Setenv("GOARM", os.Getenv("GOARM"))
+			os.Setenv("GOARM", defaultGoArm)
+		}
+	}
+	goCmd := append([]string{"go"}, cmds...)
+	utils.ExecCommand(goCmd...)
+}

=== modified file '_integration-tests/main.go'
--- _integration-tests/main.go	2015-07-24 08:13:24 +0000
+++ _integration-tests/main.go	2015-07-28 12:05:32 +0000
@@ -28,21 +28,19 @@
 	"strconv"
 	"text/template"
 
+	"launchpad.net/snappy/_integration-tests/helpers/build"
 	"launchpad.net/snappy/_integration-tests/helpers/config"
 	"launchpad.net/snappy/_integration-tests/helpers/image"
 	"launchpad.net/snappy/_integration-tests/helpers/utils"
 )
 
 const (
-	baseDir             = "/tmp/snappy-test"
-	testsBinDir         = "_integration-tests/bin/"
-	defaultRelease      = "rolling"
-	defaultChannel      = "edge"
-	defaultSSHPort      = 22
-	defaultGoArm        = "7"
-	dataOutputDir       = "_integration-tests/data/output/"
-	controlTpl          = "_integration-tests/data/tpl/control"
-	integrationTestName = "integration.test"
+	baseDir        = "/tmp/snappy-test"
+	defaultRelease = "rolling"
+	defaultChannel = "edge"
+	defaultSSHPort = 22
+	dataOutputDir  = "_integration-tests/data/output/"
+	controlTpl     = "_integration-tests/data/tpl/control"
 )
 
 var (
@@ -51,17 +49,6 @@
 	controlFile      = filepath.Join(dataOutputDir, "control")
 )
 
-func buildAssets(useSnappyFromBranch bool, arch string) {
-	utils.PrepareTargetDir(testsBinDir)
-
-	if useSnappyFromBranch {
-		// FIXME We need to build an image that has the snappy from the branch
-		// installed. --elopio - 2015-06-25.
-		buildSnappyCLI(arch)
-	}
-	buildTests(arch)
-}
-
 func setupAndRunLocalTests(rootPath, testFilter string, img image.Image) {
 	// Run the tests on the latest rolling edge image.
 	if imageName, err := img.UdfCreate(); err == nil {
@@ -75,35 +62,6 @@
 	adtRun(rootPath, testFilter, remoteTestbedSSHOptions(testbedIP, testbedPort))
 }
 
-func buildSnappyCLI(arch string) {
-	fmt.Println("Building snappy CLI...")
-	// On the root of the project we have a directory called snappy, so we
-	// output the binary for the tests in the tests directory.
-	goCall(arch, "build", "-o", testsBinDir+"snappy", "./cmd/snappy")
-}
-
-func buildTests(arch string) {
-	fmt.Println("Building tests...")
-
-	goCall(arch, "test", "-c", "./_integration-tests/tests")
-	// XXX Go test 1.3 does not have the output flag, so we move the
-	// binaries after they are generated.
-	os.Rename("tests.test", testsBinDir+integrationTestName)
-}
-
-func goCall(arch string, cmds ...string) {
-	if arch != "" {
-		defer os.Setenv("GOARCH", os.Getenv("GOARCH"))
-		os.Setenv("GOARCH", arch)
-		if arch == "arm" {
-			defer os.Setenv("GOARM", os.Getenv("GOARM"))
-			os.Setenv("GOARM", defaultGoArm)
-		}
-	}
-	goCmd := append([]string{"go"}, cmds...)
-	utils.ExecCommand(goCmd...)
-}
-
 func adtRun(rootPath, testFilter string, testbedOptions []string) {
 	createControlFile(testFilter)
 
@@ -147,7 +105,7 @@
 	defer outputFile.Close()
 
 	err = tpl.Execute(outputFile,
-		controlData{Test: integrationTestName, Filter: testFilter})
+		controlData{Test: build.IntegrationTestName, Filter: testFilter})
 	if err != nil {
 		log.Panicf("execution: %s", err)
 	}
@@ -201,7 +159,7 @@
 
 	flag.Parse()
 
-	buildAssets(*useSnappyFromBranch, *arch)
+	build.Assets(*useSnappyFromBranch, *arch)
 
 	// TODO: generate the files out of the source tree. --elopio - 2015-07-15
 	utils.PrepareTargetDir(dataOutputDir)