1
0
mirror of https://github.com/rancher/os.git synced 2025-09-17 07:30:42 +00:00

add upgrade with non-default console installed

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-01-30 16:11:46 +10:00
parent 83e6696fd3
commit fc96f75c35
3 changed files with 22 additions and 9 deletions

View File

@@ -185,13 +185,13 @@ func (s *QemuSuite) LoadInstallerImage(c *C) {
c.Assert(cmd.Run(), IsNil)
}
func (s *QemuSuite) PullAndLoadInstallerImage(c *C, tag string) {
cmd := exec.Command("sh", "-c", fmt.Sprintf("docker pull rancher/os:%s", tag))
func (s *QemuSuite) PullAndLoadInstallerImage(c *C, image string) {
cmd := exec.Command("sh", "-c", fmt.Sprintf("docker pull %s", image))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
c.Assert(cmd.Run(), IsNil)
cmd = exec.Command("sh", "-c", fmt.Sprintf("docker save rancher/os:%s | ../scripts/ssh --qemu sudo system-docker load", tag))
cmd = exec.Command("sh", "-c", fmt.Sprintf("docker save %s | ../scripts/ssh --qemu sudo system-docker load", image))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
c.Assert(cmd.Run(), IsNil)