Merge lp:~elopio/snappy-tests-job/ip into lp:~fgimenez/snappy-tests-job/trunk

[Leo Arias]

Added an ip flag to use an already provisioned testbed.

[Federico Gimenez (fgimenez)]

PASSED: Continuous integration, rev:57
http://10.55.60.183:8080/job/snappy-rolling-ci/21/
Executed test runs:

Click here to trigger a rebuild:
http://10.55.60.183:8080/job/snappy-rolling-ci/21/rebuild

review: Approve (continuous-integration)

[Federico Gimenez (fgimenez)]

I agree with my alter-ego, thanks! :)

Btw, I had to change the allowed_users field in the jlp.config to snappy-dev (taken from the snappy-jenkins config) for the trigger to work, it was fixed to my user.

=== modified file 'snappy-tests-job/main.go'
--- snappy-tests-job/main.go	2015-08-11 10:32:38 +0000
+++ snappy-tests-job/main.go	2015-08-13 05:36:45 +0000
@@ -44,6 +44,8 @@
 	var (
 		useSnappyFromBranch = flag.Bool("snappy-from-branch", false,
 			"If this flag is used, snappy will be compiled from this branch, copied to the testbed and used for the tests. Otherwise, the snappy installed with the image will be used.")
+		ip = flag.String("ip", "",
+			"IP of the testbed. If no IP is passed, a cloud instance will be started for the test.")
 		cloudProvider = flag.String("cloud", defaultCloudProvider,
 			"Cloud provider to use, defaults to "+defaultCloudProvider)
 		flavor = flag.String("flavor", defaultFlavor,
@@ -70,21 +72,24 @@
 	}
 	defer os.RemoveAll(sourcePath)
 
-	cloudClient := cloud.NewCloudClient(*cloudProvider, *flavor, utilHandler)
-	ip, err := cloudClient.CreateInstance(*release, *channel)
-	defer cloudClient.KillInstance()
-
-	if err != nil {
-		log.Panicf("Error creating image for release %s and channel %s, %s", *release, *channel, err)
+	ipString := *ip
+	if ipString == "" {
+		cloudClient := cloud.NewCloudClient(*cloudProvider, *flavor, utilHandler)
+		ipString, err = cloudClient.CreateInstance(*release, *channel)
+		defer cloudClient.KillInstance()
+
+		if err != nil {
+			log.Panicf("Error creating image for release %s and channel %s, %s", *release, *channel, err)
+		}
+
+		// give time for the instance to finish booting
+		// TODO: check with a ticker if the instance is available
+		log.Print("Waiting for instance to finish booting...")
+		time.Sleep(3 * time.Minute)
 	}
 
-	// give time for the instance to finish booting
-	// TODO: check with a ticker if the instance is available
-	log.Print("Waiting for instance to finish booting...")
-	time.Sleep(3 * time.Minute)
-
 	testRunner := runner.NewBasicRunnerHandler(utilHandler)
-	if err := testRunner.RunTests(sourcePath, *commandTpl, ip, *useSnappyFromBranch); err != nil {
+	if err := testRunner.RunTests(sourcePath, *commandTpl, ipString, *useSnappyFromBranch); err != nil {
 		log.Panic("Error from test runner")
 	}
 }