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

Proposed by Leo Arias on 2015-08-24
Status: Merged
Approved by: Sergio Schvezov on 2015-08-26
Approved revision: 637
Merged at revision: 639
Proposed branch: lp:~elopio/snappy/remove_ssh_copy
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 57 lines (+0/-19)
3 files modified
_integration-tests/README.md (+0/-3)
_integration-tests/testutils/autopkgtest/autopkgtest.go (+0/-3)
_integration-tests/testutils/autopkgtest/autopkgtest_test.go (+0/-13)
To merge this branch: bzr merge lp:~elopio/snappy/remove_ssh_copy
Reviewer Review Type Date Requested Status
Sergio Schvezov 2015-08-24 Approve on 2015-08-26
Snappy Tarmac continuous-integration Pending
Federico Gimenez continuous-integration Pending
Review via email: mp+268947@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
lp:~elopio/snappy/remove_ssh_copy updated on 2015-08-25
637. By Leo Arias on 2015-08-25

Removed the remaining references to ssh-copy-id.

Sergio Schvezov (sergiusens) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '_integration-tests/README.md'
2--- _integration-tests/README.md 2015-07-22 16:48:57 +0000
3+++ _integration-tests/README.md 2015-08-25 17:00:39 +0000
4@@ -58,9 +58,6 @@
5 go run _integration-tests/main.go --ip {testbed-ip} --port {testbed-port} \
6 --arch {testbed-arch}
7
8-The test runner will use `ssh-copy-id` to send your identity file to the
9-testbed, so it will ask for the password of the ubuntu user in the test bed.
10-
11 When running in a remote machine, the test runner assumes the test bed is in
12 the latest rolling edge version, and it will skip all the tests that
13 require a different version. See the following section for instructions for
14
15=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest.go'
16--- _integration-tests/testutils/autopkgtest/autopkgtest.go 2015-08-10 10:24:25 +0000
17+++ _integration-tests/testutils/autopkgtest/autopkgtest.go 2015-08-25 17:00:39 +0000
18@@ -22,7 +22,6 @@
19 import (
20 "fmt"
21 "path/filepath"
22- "strconv"
23 "strings"
24
25 "launchpad.net/snappy/_integration-tests/testutils"
26@@ -68,8 +67,6 @@
27
28 // AdtRunRemote runs the autopkgtests using a remote machine as the testbed.
29 func (a *Autopkgtest) AdtRunRemote(testbedIP string, testbedPort int) error {
30- execCommand("ssh-copy-id", "-p", strconv.Itoa(testbedPort),
31- "ubuntu@"+testbedIP)
32 return a.adtRun(remoteTestbedSSHOptions(testbedIP, testbedPort))
33 }
34
35
36=== modified file '_integration-tests/testutils/autopkgtest/autopkgtest_test.go'
37--- _integration-tests/testutils/autopkgtest/autopkgtest_test.go 2015-08-10 10:24:25 +0000
38+++ _integration-tests/testutils/autopkgtest/autopkgtest_test.go 2015-08-25 17:00:39 +0000
39@@ -165,19 +165,6 @@
40 check.Commentf("Expected call %s not executed 1 time", expectedMkDirCall))
41 }
42
43-func (s *AutopkgtestSuite) TestAdtRunRemoteCallsSSHCopyId(c *check.C) {
44- s.subject.AdtRunRemote(testbedIP, testbedPort)
45-
46- expectedExecCommadCall := fmt.Sprintf("ssh-copy-id -p %s ubuntu@%s", strconv.Itoa(testbedPort), testbedIP)
47-
48- outputDir := outputDir(testArtifactsPath)
49- adtrunRemoteCmd(controlFile, sourceCodePath, outputDir, testbedIP, testbedPort)
50-
51- c.Assert(s.execCalls[expectedExecCommadCall],
52- check.Equals, 1,
53- check.Commentf("Expected call %s not executed 1 time", expectedExecCommadCall))
54-}
55-
56 func (s *AutopkgtestSuite) TestAdtRunRemoteCallsExecCommand(c *check.C) {
57 s.subject.AdtRunRemote(testbedIP, testbedPort)
58

Subscribers

People subscribed via source and target branches