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

[Leo Arias]

Removed the ssh-copy-id from the integration tests execution. It's not really necessary, and it's causing time outs.

Some of the integration tests in jenkins are failing in this step. It may be because the machine is not yet ready and this does not wait enough.
This command is not really needed, so we can remove to see if the errors still appear.

[lp:~elopio/snappy/remove_ssh_copy]

637. By Leo Arias on 2015-08-25

Removed the remaining references to ssh-copy-id.

[Sergio Schvezov (sergiusens)]

I just worry this moves the potential time out further (although the counter would start at another point in time and it would be a different timer).

We might need to bring this back if we revisit 'developer-mode'

review: Approve

[Leo Arias (elopio)]

Thanks Sergio!
I think we don't need to worry about the later timeout because adt-run takes care of the retries.

=== modified file '_integration-tests/README.md'
--- _integration-tests/README.md	2015-07-22 16:48:57 +0000
+++ _integration-tests/README.md	2015-08-25 17:00:39 +0000
@@ -58,9 +58,6 @@
     go run _integration-tests/main.go --ip {testbed-ip} --port {testbed-port} \
     --arch {testbed-arch}
 
-The test runner will use `ssh-copy-id` to send your identity file to the
-testbed, so it will ask for the password of the ubuntu user in the test bed.
-
 When running in a remote machine, the test runner assumes the test bed is in
 the latest rolling edge version, and it will skip all the tests that
 require a different version. See the following section for instructions for
 
=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest.go	2015-08-10 10:24:25 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest.go	2015-08-25 17:00:39 +0000
@@ -22,7 +22,6 @@
 import (
 	"fmt"
 	"path/filepath"
-	"strconv"
 	"strings"
 
 	"launchpad.net/snappy/_integration-tests/testutils"
@@ -68,8 +67,6 @@
 
 // AdtRunRemote runs the autopkgtests using a remote machine as the testbed.
 func (a *Autopkgtest) AdtRunRemote(testbedIP string, testbedPort int) error {
-	execCommand("ssh-copy-id", "-p", strconv.Itoa(testbedPort),
-		"ubuntu@"+testbedIP)
 	return a.adtRun(remoteTestbedSSHOptions(testbedIP, testbedPort))
 }
 
 
=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest_test.go'
--- _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-08-10 10:24:25 +0000
+++ _integration-tests/testutils/autopkgtest/autopkgtest_test.go	2015-08-25 17:00:39 +0000
@@ -165,19 +165,6 @@
 		check.Commentf("Expected call %s not executed 1 time", expectedMkDirCall))
 }
 
-func (s *AutopkgtestSuite) TestAdtRunRemoteCallsSSHCopyId(c *check.C) {
-	s.subject.AdtRunRemote(testbedIP, testbedPort)
-
-	expectedExecCommadCall := fmt.Sprintf("ssh-copy-id -p %s ubuntu@%s", strconv.Itoa(testbedPort), testbedIP)
-
-	outputDir := outputDir(testArtifactsPath)
-	adtrunRemoteCmd(controlFile, sourceCodePath, outputDir, testbedIP, testbedPort)
-
-	c.Assert(s.execCalls[expectedExecCommadCall],
-		check.Equals, 1,
-		check.Commentf("Expected call %s not executed 1 time", expectedExecCommadCall))
-}
-
 func (s *AutopkgtestSuite) TestAdtRunRemoteCallsExecCommand(c *check.C) {
 	s.subject.AdtRunRemote(testbedIP, testbedPort)