Commit Graph

5 Commits

Author SHA1 Message Date
Phil Estes
cadee0374b
Revert "Merge pull request #1502 from crosbymichael/test-image"
This reverts commit 558b46f26e, reversing
changes made to 0e616f4d7a.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-09-21 15:25:34 -04:00
Michael Crosby
ca3f16c510 [tmp] Use amd64 test image
This is a workaround because official images were pushed with multi-arch
support recently and the current Pull code is not accounting for this.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-13 13:31:52 -04:00
Kenfe-Mickael Laventure
dbd3eff1e6
containerd: add state flag to specify state dir
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-08-29 08:27:44 -07:00
Christopher Jones
661bcd3e4d
Change test image based on platform
This changes testImage so it can be run on other platforms.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-08-11 14:48:14 -04:00
Kenfe-Mickael Laventure
651aaff74e
Update integration test to support windows
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-21 18:19:51 +02:00