rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-24 17:38:17 +00:00
Code Issues Releases Wiki Activity

17.06.1-ce is now in the repo

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-08-29 12:03:39 +10:00
parent cccaaeac86
commit abc00e7ca9
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -49,7 +49,7 @@ release-build:
itest: itest:
mkdir -p dist mkdir -p dist
./.dapper integration-test 2>&1 | tee dist/itest.log ./.dapper integration-test 2>&1 | tee dist/itest.log
grep FAIL dist/itest.log || true grep --binary-files=text FAIL dist/itest.log || true
qcows: qcows:
cp dist/artifacts/rancheros.iso scripts/images/openstack/ cp dist/artifacts/rancheros.iso scripts/images/openstack/

2
tests/assets/test_25/cloud-config.yml
View File

@ -2,6 +2,6 @@
rancher: rancher:
console: debian console: debian
docker: docker:
engine: docker-17.06.0-ce engine: docker-17.06.1-ce
ssh_authorized_keys: ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

3
tests/common_test.go
View File

@ -50,6 +50,7 @@ func (s *QemuSuite) TearDownTest(c *C) {
if s.qemuCmd != nil { if s.qemuCmd != nil {
s.Stop(c) s.Stop(c)
} }
time.Sleep(time.Second)
} }
// RunQemuWith requires user to specify all the `scripts/run` arguments // RunQemuWith requires user to specify all the `scripts/run` arguments
@ -252,7 +253,7 @@ func (s *QemuSuite) Stop(c *C) {
c.Assert(s.qemuCmd.Process.Kill(), IsNil) c.Assert(s.qemuCmd.Process.Kill(), IsNil)
fmt.Printf("%s: stopping qemu 3\n", c.TestName()) fmt.Printf("%s: stopping qemu 3\n", c.TestName())
s.qemuCmd.Process.Wait() s.qemuCmd.Process.Wait()
//time.Sleep(time.Millisecond * 1000) time.Sleep(time.Second)
s.qemuCmd = nil s.qemuCmd = nil
fmt.Printf("--- %s: qemu stopped", c.TestName()) fmt.Printf("--- %s: qemu stopped", c.TestName())
} }