Merge into 15.04-deprecated : 15.04-modprobe-config : Code : Snappy

Status:	Merged
Approved by:	Michael Vogt on 2015-09-11
Approved revision:	470
Merged at revision:	473
Proposed branch:	lp://qastaging/~mvo/snappy/15.04-modprobe-config
Merge into:	lp://qastaging/~snappy-dev/snappy/15.04-deprecated
Diff against target:	232 lines (+77/-0) 2 files modified coreconfig/config.go (+33/-0) coreconfig/config_test.go (+44/-0)
To merge this branch:	bzr merge lp://qastaging/~mvo/snappy/15.04-modprobe-config
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Michael Vogt (community)		Approve on 2015-09-11
John Lenton (community)	2015-09-08	Approve on 2015-09-08
Review via email: mp+270411@code.qastaging.launchpad.net

Commit message

Add support for ubuntu-core.modprobe configuration.

Description of the change

This branch adds support for configuring ubuntu-core.modprobe which will be applied to /etc/modprobe.d/ubuntu-core-conf

Revision history for this message

John Lenton (chipaca) on 2015-09-08:

#

review: Approve

Revision history for this message

Sergio Schvezov (sergiusens) wrote on 2015-09-09:

#

missing the commit message!

Revision history for this message

Snappy Tarmac (snappydevtarmac) wrote on 2015-09-10:

#

Download full text (7.3 KiB)

The attempt to merge lp:~mvo/snappy/15.04-modprobe-config into lp:snappy/15.04 failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update gopkg.in/check.v1 failed; trying to fetch newer version
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update code.google.com/p/go.crypto failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/juju/loggo failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.y7ug5Q2hWa/src/launchpad.net/snappy
=== RUN Test
OK: 10 passed
--- PASS: Test (0.50 seconds)
PASS
coverage: 79.3% of statements
ok launchpad.net/snappy/clickdeb 0.509s coverage: 79.3% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.54 seconds)
PASS
coverage: 12.5% of statements
ok launchpad.net/snappy/cmd/snappy 0.551s coverage: 12.5% of statements
=== RUN Test
OK: 26 passed
--- PASS: Test (0.06 seconds)
PASS
coverage: 96.7% of statements
ok launchpad.net/snappy/coreconfig 0.061s coverage: 96.7% of statements
=== RUN Test
OK: 33 passed
--- PASS: Test (13.92 seconds)
PASS
coverage: 74.0% of statements
ok launchpad.net/snappy/helpers 13.931s coverage: 74.0% of statements
=== RUN Test
OK: 7 passed
--- PASS: Test (0.04 seconds)
PASS
coverage: 92.5% of statements
ok launchpad.net/snappy/logger 0.046s coverage: 92.5% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok launchpad.net/snappy/oauth 0.006s coverage: 100.0% of statements
=== RUN Test
OK: 40 passed
--- PASS: Test (1.02 seconds)
PASS
coverage: 80.3% of statements
ok launchpad.net/snappy/partition 1.039s coverage: 80.3% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.64 seconds)
PASS
coverage: 87.8% of statements
ok launchpad.net/snappy/policy 0.650s coverage: 87.8% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.04 seconds)
PASS
coverage: 84.8% of statements
ok launchpad.net/snappy/priv 0.054s coverage: 84.8% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 50.0% of statements
ok launchpad.net/snappy/progress 0.013s coverage: 50.0% of statements
=== RUN Test
OK...

The attempt to merge lp:~mvo/snappy/15.04-modprobe-config into lp:snappy/15.04 failed. Below is the output from the failed tests.

Checking formatting
Installing godeps
Install golint
Obtaining dependencies
update github.com/blakesmith/ar failed; trying to fetch newer version
update github.com/cheggaaa/pb failed; trying to fetch newer version
github.com/blakesmith/ar now at c9a977dd0cc1392b023382c7bfa5a22af8d3b730
update github.com/jessevdk/go-flags failed; trying to fetch newer version
github.com/cheggaaa/pb now at e8c7cc515bfde3e267957a3b110080ceed51354e
update github.com/mvo5/uboot-go failed; trying to fetch newer version
github.com/jessevdk/go-flags now at 15347ef417a300349807983f15af9e65cd2e1b3a
github.com/mvo5/uboot-go now at 361f6ebcbb54f389d15dc9faefa000e996ba3e37
update gopkg.in/check.v1 failed; trying to fetch newer version
update gopkg.in/yaml.v2 failed; trying to fetch newer version
gopkg.in/check.v1 now at 64131543e7896d5bcc6bd5a76287eb75ea96c673
update code.google.com/p/go.crypto failed; trying to fetch newer version
gopkg.in/yaml.v2 now at 49c95bdc21843256fb6c4e0d370a05f24a0bf213
update github.com/juju/loggo failed; trying to fetch newer version
code.google.com/p/go.crypto now at 69e2a90ed92d03812364aeb947b7068dc42e561e
update github.com/mvo5/goconfigparser failed; trying to fetch newer version
github.com/juju/loggo now at 4c7cbce140ca070eeb59a28f4bf9507e511711f9
github.com/mvo5/goconfigparser now at 26426272dda20cc76aa1fa44286dc743d2972fe8
Building
Running tests from /tmp/tmp.y7ug5Q2hWa/src/launchpad.net/snappy
=== RUN Test
OK: 10 passed
--- PASS: Test (0.50 seconds)
PASS
coverage: 79.3% of statements
ok  	launchpad.net/snappy/clickdeb	0.509s	coverage: 79.3% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.54 seconds)
PASS
coverage: 12.5% of statements
ok  	launchpad.net/snappy/cmd/snappy	0.551s	coverage: 12.5% of statements
=== RUN Test
OK: 26 passed
--- PASS: Test (0.06 seconds)
PASS
coverage: 96.7% of statements
ok  	launchpad.net/snappy/coreconfig	0.061s	coverage: 96.7% of statements
=== RUN Test
OK: 33 passed
--- PASS: Test (13.92 seconds)
PASS
coverage: 74.0% of statements
ok  	launchpad.net/snappy/helpers	13.931s	coverage: 74.0% of statements
=== RUN Test
OK: 7 passed
--- PASS: Test (0.04 seconds)
PASS
coverage: 92.5% of statements
ok  	launchpad.net/snappy/logger	0.046s	coverage: 92.5% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 100.0% of statements
ok  	launchpad.net/snappy/oauth	0.006s	coverage: 100.0% of statements
=== RUN Test
OK: 40 passed
--- PASS: Test (1.02 seconds)
PASS
coverage: 80.3% of statements
ok  	launchpad.net/snappy/partition	1.039s	coverage: 80.3% of statements
=== RUN Test
OK: 12 passed
--- PASS: Test (0.64 seconds)
PASS
coverage: 87.8% of statements
ok  	launchpad.net/snappy/policy	0.650s	coverage: 87.8% of statements
=== RUN Test
OK: 3 passed
--- PASS: Test (0.04 seconds)
PASS
coverage: 84.8% of statements
ok  	launchpad.net/snappy/priv	0.054s	coverage: 84.8% of statements
=== RUN Test
OK: 4 passed
--- PASS: Test (0.00 seconds)
PASS
coverage: 50.0% of statements
ok  	launchpad.net/snappy/progress	0.013s	coverage: 50.0% of statements
=== RUN Test
OK: 6 passed
--- PASS: Test (0.01 seconds)
PASS
coverage: 100.0% of statements
ok  	launchpad.net/snappy/release	0.016s	coverage: 100.0% of statements
=== RUN Test
2015-09-10 06:32:11 ERROR snappy logger.go:199 hello-app.potato failed to install: a package by that name is already installed
2015-09-10 06:32:11 ERROR snappy logger.go:199 foo failed to install: the given snap is already installed
foo foo-fork
2015/09/10 06:32:12 Use of deprecated "framework" key in yaml
2015/09/10 06:32:12 Use of deprecated "framework" key in yaml
2015/09/10 06:32:12 WARNING: Skipping hook apparmor
2015/09/10 06:32:12 WARNING: Skipping hook apparmor
2015/09/10 06:32:12 WARNING: Skipping hook apparmor
2015/09/10 06:32:18 WARNING: Skipping hook apparmor
2015/09/10 06:32:18 WARNING: Skipping hook apparmor
2015/09/10 06:32:18 WARNING: Skipping hook apparmor
2015/09/10 06:32:18 WARNING: Skipping hook apparmor
2015/09/10 06:32:18 WARNING: Skipping hook apparmor
2015-09-10 06:32:18 ERROR snappy logger.go:199 snappy package cannot be removed
2015-09-10 06:32:18 ERROR snappy logger.go:199 snappy package cannot be removed
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
2015/09/10 06:32:19 WARNING: Skipping hook apparmor
OK: 257 passed
--- PASS: Test (10.87 seconds)
PASS
coverage: 78.9% of statements
ok  	launchpad.net/snappy/snappy	10.885s	coverage: 78.9% of statements
=== RUN Test
OK: 14 passed
--- PASS: Test (0.53 seconds)
PASS
coverage: 70.8% of statements
ok  	launchpad.net/snappy/systemd	0.537s	coverage: 70.8% of statements
Running vet
Running lint
Lint complains:
coreconfig/config.go:44:15: should omit type string from declaration of var modprobePath; it will be inferred from the right-hand side

# we always run in a fresh dir in tarmac
export GOPATH=$(mktemp -d)
trap 'rm -rf "$GOPATH"' EXIT

# this is a hack, but not sure tarmac is golang friendly
mkdir -p $GOPATH/src/launchpad.net/snappy
cp -a . $GOPATH/src/launchpad.net/snappy/
cd $GOPATH/src/launchpad.net/snappy

./run-checks

if which goctest >/dev/null; then
    goctest="goctest"
else
    goctest="go test"
fi

echo Checking formatting
fmt=$(gofmt -l .)

if [ -n "$fmt" ]; then
    echo "Formatting wrong in following files"
    echo "$fmt"
    exit 1
fi

echo Installing godeps
go get launchpad.net/godeps
export PATH=$PATH:$GOPATH/bin

echo Install golint
go get github.com/golang/lint/golint
export PATH=$PATH:$GOPATH/bin

echo Obtaining dependencies
godeps -u dependencies.tsv

echo Building
go build -v launchpad.net/snappy/...
github.com/blakesmith/ar
github.com/juju/loggo
code.google.com/p/go.crypto/ssh/terminal
launchpad.net/snappy/logger
launchpad.net/snappy/helpers
github.com/jessevdk/go-flags
launchpad.net/snappy/priv
github.com/cheggaaa/pb
launchpad.net/snappy/progress
launchpad.net/snappy/clickdeb
github.com/mvo5/goconfigparser
gopkg.in/yaml.v2
launchpad.net/snappy/oauth
github.com/mvo5/uboot-go/uenv
launchpad.net/snappy/policy
launchpad.net/snappy/release
launchpad.net/snappy/systemd
launchpad.net/snappy/coreconfig
launchpad.net/snappy/partition
launchpad.net/snappy/snappy
launchpad.net/snappy/cmd/snappy

# tests
echo Running tests from $(pwd)
$goctest -v -cover ./...

# go vet
echo Running vet
go vet ./...
go vet ./_integration-tests/tests/...
go vet ./_integration-tests/testutils/...

# golint
echo Running lint
lint=$(golint ./... && golint ./_integration-tests/testutils/... && golint ./_integration-tests/tests/...)
if [ -n "$lint" ]; then
    echo "Lint complains:"
    echo "$lint"
    exit 1
fi

lp://qastaging/~mvo/snappy/15.04-modprobe-config updated on 2015-09-11

470. By Michael Vogt on 2015-09-11: coreconfig/config.go: fix go vet

Revision history for this message

Michael Vogt (mvo) on 2015-09-11:

#

review: Approve

Snappy

Merge lp://qastaging/~mvo/snappy/15.04-modprobe-config into lp://qastaging/~snappy-dev/snappy/15.04-deprecated

Commit message

Description of the change

Preview Diff

Subscribers