From abc00e7ca929b8621c220961503de6d95eccbe79 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 29 Aug 2017 12:03:39 +1000 Subject: [PATCH] 17.06.1-ce is now in the repo Signed-off-by: Sven Dowideit --- Makefile | 2 +- tests/assets/test_25/cloud-config.yml | 2 +- tests/common_test.go | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 240bd194..c379b814 100755 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ release-build: itest: mkdir -p dist ./.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: cp dist/artifacts/rancheros.iso scripts/images/openstack/ diff --git a/tests/assets/test_25/cloud-config.yml b/tests/assets/test_25/cloud-config.yml index 8ed3a96e..fc2f86a7 100644 --- a/tests/assets/test_25/cloud-config.yml +++ b/tests/assets/test_25/cloud-config.yml @@ -2,6 +2,6 @@ rancher: console: debian docker: - engine: docker-17.06.0-ce + engine: docker-17.06.1-ce ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF diff --git a/tests/common_test.go b/tests/common_test.go index 8417680e..6f3886e0 100755 --- a/tests/common_test.go +++ b/tests/common_test.go @@ -50,6 +50,7 @@ func (s *QemuSuite) TearDownTest(c *C) { if s.qemuCmd != nil { s.Stop(c) } + time.Sleep(time.Second) } // 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) fmt.Printf("%s: stopping qemu 3\n", c.TestName()) s.qemuCmd.Process.Wait() - //time.Sleep(time.Millisecond * 1000) + time.Sleep(time.Second) s.qemuCmd = nil fmt.Printf("--- %s: qemu stopped", c.TestName()) }