Merge lp:~chipaca/snappy/firstboot-ordering into lp:~snappy-dev/snappy/snappy-moved-to-github

[John Lenton]

Make firstboot happen before ifup.

[John Lenton (chipaca)]

This is not the whole story.

cloud-init.service needs a Requires=networking.service

(or networking.target needs a Requires=networking.service, or something like that)

...

and on further testing, that might not be enough.

WIll conitnue with this in the morning.

[Michael Vogt (mvo)]

\o/

[Michael Vogt (mvo)]

Nice! Thanks a lot for finding this.

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~chipaca/snappy/firstboot-ordering into lp:snappy failed. Below is the output from the failed tests.

Checking docs
Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/coreos/go-systemd failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/gorilla/context failed; trying to fetch newer version
github.com/coreos/go-systemd now at f743bc15d6bddd23662280b4ad20f7c874cdd5ad
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/gorilla/context now at 1c83b3eabd45b6d76072b66b746c20815fb2872d
update golang.org/x/crypto failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 1acbbaff2f347c412a0c7884873bd72cc9c1f5b4
update gopkg.in/yaml.v2 failed; trying to fetch newer version
golang.org/x/crypto now at 60052bd85f2d91293457e8811b0cf26b773de469
update github.com/gorilla/mux failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/gorilla/mux now at ee1815431e497d3850809578c93ab6705f1a19f7
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update gopkg.in/check.v1 failed; trying to fetch newer version
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update github.com/gosexy/gettext failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update github.com/peterh/liner failed; trying to fetch newer version
github.com/gosexy/gettext now at 98b7b91596d20b96909e6b60d57411547dd9959c
update gopkg.in/tomb.v2 failed; trying to fetch newer version
github.com/peterh/liner now at 1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced
update code.google.com/p/go.crypto failed; trying to fetch newer version
gopkg.in/tomb.v2 now at 14b3d72120e8d10ea6e6b7f87f7175734b1faab8
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
Building
Running tests from /tmp/tmp.A55ZfXiwFN/src/launchpad.net/snappy
? launchpad.net/snappy/cmd/snapd [no test files]
=== RUN Test
OK: 12 passed
--- PASS: Test (0.03 seconds)
PASS
coverage: 21.2% of statements
ok launchpad.net/snappy/cmd/snappy 0.041s coverage: 21.2% of statements
=== RUN Test
OK: 53 passed
--- PASS: Test (0.44 seconds)
PASS
coverage: 91.7% of statements
ok launchpad.net/snappy/coreconfig 0.452s coverage: 91.7% of statements
=== RUN Test
OK: 39 passed
--- PASS: Test (0.22 seconds)
PASS
coverage: 69.8% of statements
ok launchpad.net/snappy/daemon 0.239s coverage: 69.8% of statements
? launchpad.net/snappy/dirs [no test files]
=== RUN Test
OK: 59 passed
--- PASS: Test (0.46 seconds)
PASS
coverage: 78.9% of statements
ok launchpad.net/snappy/helpers 0.472s coverage: 78.9% of statements
=== RUN Test
OK: 0 passed, 2 skipped...

[lp:~chipaca/snappy/firstboot-ordering]

795. By John Lenton on 2015-10-22

nuke tests that aren't applicable any more

[Federico Gimenez (fgimenez)]

Works fine on amd64 after adding the new binary and the modified unit to the image

review: Approve (test)

[Michael Vogt (mvo)]

review: Approve

=== modified file 'debian/ubuntu-snappy.firstboot.service'
--- debian/ubuntu-snappy.firstboot.service	2015-04-19 08:21:54 +0000
+++ debian/ubuntu-snappy.firstboot.service	2015-10-22 10:12:56 +0000
@@ -1,6 +1,7 @@
 [Unit]
 Description=Run snappy firstboot setup
-Before=cloud-init.service
+After=local-fs.target
+Before=system-ifup.slice cloud-init-local.service cloud-init.service
 
 [Service]
 Type=oneshot
 
=== modified file 'snappy/firstboot.go'
--- snappy/firstboot.go	2015-09-23 12:07:42 +0000
+++ snappy/firstboot.go	2015-10-22 10:12:56 +0000
@@ -28,7 +28,6 @@
 
 	"launchpad.net/snappy/helpers"
 	"launchpad.net/snappy/pkg"
-	"launchpad.net/snappy/systemd"
 
 	"gopkg.in/yaml.v2"
 )
@@ -140,10 +139,6 @@
 		return err
 	}
 
-	if _, err := systemd.SystemctlCmd("restart", "networking", "--no-block"); err != nil {
-		return err
-	}
-
 	return nil
 }
 
 
=== modified file 'snappy/firstboot_test.go'
--- snappy/firstboot_test.go	2015-09-23 12:07:42 +0000
+++ snappy/firstboot_test.go	2015-10-22 10:12:56 +0000
@@ -28,7 +28,6 @@
 	. "gopkg.in/check.v1"
 
 	"launchpad.net/snappy/pkg"
-	"launchpad.net/snappy/systemd"
 )
 
 type fakePart struct {
@@ -55,21 +54,11 @@
 	oemConfig map[string]interface{}
 	globs     []string
 	ethdir    string
-	sctlargs  []string
-	sctlerr   error
 }
 
 var _ = Suite(&FirstBootTestSuite{})
 
-func (s *FirstBootTestSuite) systemctl(args ...string) (out []byte, err error) {
-	s.sctlargs = args
-	return nil, s.sctlerr
-}
-
 func (s *FirstBootTestSuite) SetUpTest(c *C) {
-	s.sctlerr = nil
-	s.sctlargs = nil
-	systemd.SystemctlCmd = s.systemctl
 	stampFile = filepath.Join(c.MkDir(), "stamp")
 
 	configMyApp := make(SystemConfig)
@@ -161,20 +150,6 @@
 	c.Assert(err, IsNil)
 	c.Check(string(bs), Equals, "allow-hotplug eth42\niface eth42 inet dhcp\n")
 
-	c.Check(s.sctlargs, DeepEquals, []string{"restart", "networking", "--no-block"})
-}
-
-func (s *FirstBootTestSuite) TestEnableFirstEtherSomeEthFailsIfSystemctlFails(c *C) {
-	dir := c.MkDir()
-	_, err := os.Create(filepath.Join(dir, "eth42"))
-	c.Assert(err, IsNil)
-	s.sctlerr = fmt.Errorf("Error")
-
-	globs = []string{filepath.Join(dir, "eth*")}
-	c.Check(enableFirstEther(), Equals, s.sctlerr)
-	fs, _ := filepath.Glob(filepath.Join(ethdir, "*"))
-	c.Check(fs, HasLen, 1)
-	c.Check(s.sctlargs, DeepEquals, []string{"restart", "networking", "--no-block"})
 }
 
 func (s *FirstBootTestSuite) TestEnableFirstEtherBadEthDir(c *C) {