1
diff --git a/run-tests.sh b/run-tests.sh
2
index f030283..bb879ba 100755
3
--- a/run-tests.sh
4
+++ b/run-tests.sh
5
@@ -22,20 +22,31 @@ TESTS_EXTRAS_PATH=".tests-extras"
6
22
# Display help.
22
# Display help.
7
23
# This has to be in sync with the tests-extras/test-runner.sh script
23
# This has to be in sync with the tests-extras/test-runner.sh script
8
24
# functionalities as the parameters to this one are passed directly there
24
# functionalities as the parameters to this one are passed directly there
9
25
# this function will quit the script because of the 'exec' keyword
10
25
show_help() {
26
show_help() {
24
26
    echo "Usage: run-tests.sh [OPTIONS]"
27
    exec cat <<'EOF'
25
27
    echo
28
Usage: run-tests.sh [OPTIONS]
26
28
    echo "This is fetch & forget script and what it does is to fetch the"
29
27
29
    echo "tests-extras repository and execute the run-tests.sh script from"
30
This is fetch & forget script and what it does is to fetch the
28
30
    echo "there passing arguments as-is."
31
tests-extras repository and execute the run-tests.sh script from
29
31
    echo
32
there passing arguments as-is.
30
32
    echo "optional arguments:"
33
31
33
    echo "  --help                 Show this help message and exit"
34
optional arguments:
32
34
    echo "  --channel              Select another channel to build the base image from (default: stable)"
35
  --help                           Show this help message and exit
33
35
    echo "  --snap                 Extra snap to install"
36
  --channel=<channel>              Select another channel to build the base image from (default: $channel)
34
36
    echo "  --debug                Enable verbose debugging output"
37
  --snap=<name>                    Extra snap to install
35
37
    echo "  --test-from-channel    Pull network-manager snap from the specified channel instead of building it from source"
38
  --debug                          Enable verbose debugging output
36
38
    echo "  --force-new-image      Force generating a new image used for testing"
39
  --test-from-channel=<channel>    Pull snap from the specified channel instead of building it from source
37
40
  --spread-system=<system>         Name of a spread system to use for testing
38
41
  --spread-filter=<filter>         Spread filter expressions for test cases
39
42
  --external-address=<IP address>  Address of external backend used for testing
40
43
  --external-user=<user name>      User name to use on external test backend (default: $external_user)
41
44
  --external-password=<password>   Password to use for specified external user (default: $external_password)
42
45
  --force-new-image                Force generating a new image used for testing
43
46
  --image-unsigned-core            Use an unsigned core snap for the generated image
44
47
  --image-unsigned-gadget          Use an unsigned gadget snap for the generated image
45
48
  --image-unsigned-kernel          Use an unsigned kernel snap for the generated image
46
49
EOF
47
39
}
50
}
48
40
51
49
41
# Clone the tests-extras repository
52
# Clone the tests-extras repository
50
diff --git a/spread.yaml b/spread.yaml
51
index c5e1e1b..a4920c2 100644
52
--- a/spread.yaml
53
+++ b/spread.yaml
54
@@ -13,15 +13,17 @@
55
13
# You should have received a copy of the GNU General Public License
13
# You should have received a copy of the GNU General Public License
56
14
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
57
15
15
58
16
59
17
project: alsa-utils
16
project: alsa-utils
60
18
17
61
18
kill-timeout: 2h
62
19
warn-timeout: 40m
63
20
64
19
environment:
21
environment:
65
20
    SNAP_NAME: alsa-utils
22
    SNAP_NAME: alsa-utils
66
21
    PROJECT_PATH: /home/${SNAP_NAME}
23
    PROJECT_PATH: /home/${SNAP_NAME}
67
22
    TESTSLIB: $PROJECT_PATH/tests/integration/lib
24
    TESTSLIB: $PROJECT_PATH/tests/integration/lib
68
23
    SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
25
    SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
70
24
    SNAP_ARCH: amd64
26
    SNAP_ARCH: $(dpkg --print-architecture)
71
25
    SNAP_AUTOCONNECT_CORE_PLUGS: alsa home
27
    SNAP_AUTOCONNECT_CORE_PLUGS: alsa home
72
26
    SNAP_AUTO_ALIASES: arecord aplay alsamixer amixer alsaucm alsactl speaker-test aseqnet alsatplg arecordmidi amidi alsaloop aconnect iecset alsabat aseqdump aplaymidi
28
    SNAP_AUTO_ALIASES: arecord aplay alsamixer amixer alsaucm alsactl speaker-test aseqnet alsatplg arecordmidi amidi alsaloop aconnect iecset alsabat aseqdump aplaymidi
73
27
29
74
@@ -31,6 +33,16 @@ backends:
75
31
            - ubuntu-core-16:
33
            - ubuntu-core-16:
76
32
                username: test
34
                username: test
77
33
                password: test
35
                password: test
78
36
    external:
79
37
        type: adhoc
80
38
        environment:
81
39
            SPREAD_EXTERNAL_ADDRESS: "$(HOST: echo ${SPREAD_EXTERNAL_ADDRESS:-localhost:8022})"
82
40
        allocate: |
83
41
            ADDRESS $SPREAD_EXTERNAL_ADDRESS
84
42
        systems:
85
43
            - hw-ubuntu-core-16:
86
44
                username: $(HOST:echo $SPREAD_EXTERNAL_USER)
87
45
                password: $(HOST:echo $SPREAD_EXTERNAL_PASSWORD)
88
34
46
89
35
path: /home/alsa-utils
47
path: /home/alsa-utils
90
36
48
91
@@ -45,6 +57,7 @@ suites:
92
45
        summary: Full-system tests for the alsa-utils snap
57
        summary: Full-system tests for the alsa-utils snap
93
46
        systems:
58
        systems:
94
47
            - ubuntu-core-16
59
            - ubuntu-core-16
95
60
            - hw-ubuntu-core-16
96
48
        prepare: |
61
        prepare: |
97
49
            . $TESTSLIB/prepare.sh
62
            . $TESTSLIB/prepare.sh
98
50
        restore-each: |
63
        restore-each: |
99
diff --git a/tests/integration/main/content-statefile/task.yaml b/tests/integration/main/content-statefile/task.yaml
100
index 2782c35..6227ef9 100644
101
--- a/tests/integration/main/content-statefile/task.yaml
102
+++ b/tests/integration/main/content-statefile/task.yaml
103
@@ -1,5 +1,10 @@
104
1
summary: Verify that initial state file can be pulled over the content interface
1
summary: Verify that initial state file can be pulled over the content interface
105
2
2
106
3
systems:
107
4
    # Do not run on real hardware as this test requires an unsigned gadget snap
108
5
    # in the image and we cannot guarantee that in this case.
109
6
    - -hw-ubuntu-core-16
110
7
111
3
prepare: |
8
prepare: |
112
4
    . $TESTSLIB/snap-names.sh
9
    . $TESTSLIB/snap-names.sh
113
5
    snap list | grep $gadget_name | awk '{print $2}' > gadget_version
10
    snap list | grep $gadget_name | awk '{print $2}' > gadget_version
114
diff --git a/tests/integration/main/documentation-builds/task.yaml b/tests/integration/main/documentation-builds/task.yaml
115
index 7fef7b1..ccac8ae 100644
116
--- a/tests/integration/main/documentation-builds/task.yaml
117
+++ b/tests/integration/main/documentation-builds/task.yaml
118
@@ -1,5 +1,10 @@
119
1
summary: Verify the project documentation is building without errors
1
summary: Verify the project documentation is building without errors
120
2
2
121
3
systems:
122
4
    # Do not run on real hardware as documentation-builder is not available in
123
5
    # all archs.
124
6
    - -hw-ubuntu-core-16
125
7
126
3
execute: |
8
execute: |
127
4
    # Need to install in devmode as otherwise the snap can't access our project
9
    # Need to install in devmode as otherwise the snap can't access our project
128
5
    # home which is outside of the home directory of our current user.
10
    # home which is outside of the home directory of our current user.
129
diff --git a/tests/integration/main/validate-manual-tests/task.yaml b/tests/integration/main/validate-manual-tests/task.yaml
130
index 1b8b481..8edd337 100644
131
--- a/tests/integration/main/validate-manual-tests/task.yaml
132
+++ b/tests/integration/main/validate-manual-tests/task.yaml
133
@@ -2,7 +2,7 @@ summary: Validate all manual plainbox test cases so that we don't ship any broke
134
2
2
135
3
execute: |
3
execute: |
136
4
    snap install --devmode --beta classic
4
    snap install --devmode --beta classic
138
5
    cat <<-EOF > /home/test/validate-manual-tests.sh
5
    cat <<-EOF > ${PROJECT_PATH}/validate-manual-tests.sh
139
6
    #!/bin/sh
6
    #!/bin/sh
140
7
    set -ex
7
    set -ex
141
8
    apt update
8
    apt update
142
@@ -13,5 +13,5 @@ execute: |
143
13
    python3 manage.py develop
13
    python3 manage.py develop
144
14
    python3 manage.py validate
14
    python3 manage.py validate
145
15
    EOF
15
    EOF
148
16
    chmod +x /home/test/validate-manual-tests.sh
16
    chmod +x ${PROJECT_PATH}/validate-manual-tests.sh
149
17
    sudo classic /home/test/validate-manual-tests.sh
17
    sudo classic ${PROJECT_PATH}/validate-manual-tests.sh
Status:	Merged
Approved by:	Simon Fels on 2017-04-11
Approved revision:	4f7f9e9139f19ad3261d7743ff74a2bcce047030
Merged at revision:	0c42fad04f5f5193bf6c7e1c283cca44fdf30fad
Proposed branch:	~alfonsosanchezbeato/snappy-hwe-snaps/+git/alsa-utils:run-on-hw
Merge into:	~snappy-hwe-team/snappy-hwe-snaps/+git/alsa-utils:master
Diff against target:	149 lines (+52/-18) 5 files modified run-tests.sh (+24/-13) spread.yaml (+15/-2) tests/integration/main/content-statefile/task.yaml (+5/-0) tests/integration/main/documentation-builds/task.yaml (+5/-0) tests/integration/main/validate-manual-tests/task.yaml (+3/-3)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Simon Fels			Approve on 2017-04-11
System Enablement Bot	continuous-integration		Approve on 2017-04-07
Jim Hodapp (community)			Approve on 2017-04-04
Konrad Zapałowicz (community)	code	2017-04-04	Approve on 2017-04-04
Review via email: mp+321824@code.launchpad.net
1	diff --git a/run-tests.sh b/run-tests.sh
2	index f030283..bb879ba 100755
3	--- a/run-tests.sh
4	+++ b/run-tests.sh
5	@@ -22,20 +22,31 @@ TESTS_EXTRAS_PATH=".tests-extras"
6	22	# Display help.	22	# Display help.
7	23	# This has to be in sync with the tests-extras/test-runner.sh script	23	# This has to be in sync with the tests-extras/test-runner.sh script
8	24	# functionalities as the parameters to this one are passed directly there	24	# functionalities as the parameters to this one are passed directly there
9			25	# this function will quit the script because of the 'exec' keyword
10	25	show_help() {	26	show_help() {
24	26	echo "Usage: run-tests.sh [OPTIONS]"	27	exec cat <<'EOF'
25	27	echo	28	Usage: run-tests.sh [OPTIONS]
26	28	echo "This is fetch & forget script and what it does is to fetch the"	29
27	29	echo "tests-extras repository and execute the run-tests.sh script from"	30	This is fetch & forget script and what it does is to fetch the
28	30	echo "there passing arguments as-is."	31	tests-extras repository and execute the run-tests.sh script from
29	31	echo	32	there passing arguments as-is.
30	32	echo "optional arguments:"	33
31	33	echo " --help Show this help message and exit"	34	optional arguments:
32	34	echo " --channel Select another channel to build the base image from (default: stable)"	35	--help Show this help message and exit
33	35	echo " --snap Extra snap to install"	36	--channel=<channel> Select another channel to build the base image from (default: $channel)
34	36	echo " --debug Enable verbose debugging output"	37	--snap=<name> Extra snap to install
35	37	echo " --test-from-channel Pull network-manager snap from the specified channel instead of building it from source"	38	--debug Enable verbose debugging output
36	38	echo " --force-new-image Force generating a new image used for testing"	39	--test-from-channel=<channel> Pull snap from the specified channel instead of building it from source
37			40	--spread-system=<system> Name of a spread system to use for testing
38			41	--spread-filter=<filter> Spread filter expressions for test cases
39			42	--external-address=<IP address> Address of external backend used for testing
40			43	--external-user=<user name> User name to use on external test backend (default: $external_user)
41			44	--external-password=<password> Password to use for specified external user (default: $external_password)
42			45	--force-new-image Force generating a new image used for testing
43			46	--image-unsigned-core Use an unsigned core snap for the generated image
44			47	--image-unsigned-gadget Use an unsigned gadget snap for the generated image
45			48	--image-unsigned-kernel Use an unsigned kernel snap for the generated image
46			49	EOF
47	39	}	50	}
48	40		51
49	41	# Clone the tests-extras repository	52	# Clone the tests-extras repository
50	diff --git a/spread.yaml b/spread.yaml
51	index c5e1e1b..a4920c2 100644
52	--- a/spread.yaml
53	+++ b/spread.yaml
54	@@ -13,15 +13,17 @@
55	13	# You should have received a copy of the GNU General Public License	13	# You should have received a copy of the GNU General Public License
56	14	# along with this program. If not, see <http://www.gnu.org/licenses/>.	14	# along with this program. If not, see <http://www.gnu.org/licenses/>.
57	15		15
58	16
59	17	project: alsa-utils	16	project: alsa-utils
60	18		17
61			18	kill-timeout: 2h
62			19	warn-timeout: 40m
63			20
64	19	environment:	21	environment:
65	20	SNAP_NAME: alsa-utils	22	SNAP_NAME: alsa-utils
66	21	PROJECT_PATH: /home/${SNAP_NAME}	23	PROJECT_PATH: /home/${SNAP_NAME}
67	22	TESTSLIB: $PROJECT_PATH/tests/integration/lib	24	TESTSLIB: $PROJECT_PATH/tests/integration/lib
68	23	SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)	25	SNAP_CHANNEL: $(HOST:echo $SNAP_CHANNEL)
70	24	SNAP_ARCH: amd64	26	SNAP_ARCH: $(dpkg --print-architecture)
71	25	SNAP_AUTOCONNECT_CORE_PLUGS: alsa home	27	SNAP_AUTOCONNECT_CORE_PLUGS: alsa home
72	26	SNAP_AUTO_ALIASES: arecord aplay alsamixer amixer alsaucm alsactl speaker-test aseqnet alsatplg arecordmidi amidi alsaloop aconnect iecset alsabat aseqdump aplaymidi	28	SNAP_AUTO_ALIASES: arecord aplay alsamixer amixer alsaucm alsactl speaker-test aseqnet alsatplg arecordmidi amidi alsaloop aconnect iecset alsabat aseqdump aplaymidi
73	27		29
74	@@ -31,6 +33,16 @@ backends:
75	31	- ubuntu-core-16:	33	- ubuntu-core-16:
76	32	username: test	34	username: test
77	33	password: test	35	password: test
78			36	external:
79			37	type: adhoc
80			38	environment:
81			39	SPREAD_EXTERNAL_ADDRESS: "$(HOST: echo ${SPREAD_EXTERNAL_ADDRESS:-localhost:8022})"
82			40	allocate: \|
83			41	ADDRESS $SPREAD_EXTERNAL_ADDRESS
84			42	systems:
85			43	- hw-ubuntu-core-16:
86			44	username: $(HOST:echo $SPREAD_EXTERNAL_USER)
87			45	password: $(HOST:echo $SPREAD_EXTERNAL_PASSWORD)
88	34		46
89	35	path: /home/alsa-utils	47	path: /home/alsa-utils
90	36		48
91	@@ -45,6 +57,7 @@ suites:
92	45	summary: Full-system tests for the alsa-utils snap	57	summary: Full-system tests for the alsa-utils snap
93	46	systems:	58	systems:
94	47	- ubuntu-core-16	59	- ubuntu-core-16
95			60	- hw-ubuntu-core-16
96	48	prepare: \|	61	prepare: \|
97	49	. $TESTSLIB/prepare.sh	62	. $TESTSLIB/prepare.sh
98	50	restore-each: \|	63	restore-each: \|
99	diff --git a/tests/integration/main/content-statefile/task.yaml b/tests/integration/main/content-statefile/task.yaml
100	index 2782c35..6227ef9 100644
101	--- a/tests/integration/main/content-statefile/task.yaml
102	+++ b/tests/integration/main/content-statefile/task.yaml
103	@@ -1,5 +1,10 @@
104	1	summary: Verify that initial state file can be pulled over the content interface	1	summary: Verify that initial state file can be pulled over the content interface
105	2		2
106			3	systems:
107			4	# Do not run on real hardware as this test requires an unsigned gadget snap
108			5	# in the image and we cannot guarantee that in this case.
109			6	- -hw-ubuntu-core-16
110			7
111	3	prepare: \|	8	prepare: \|
112	4	. $TESTSLIB/snap-names.sh	9	. $TESTSLIB/snap-names.sh
113	5	snap list \| grep $gadget_name \| awk '{print $2}' > gadget_version	10	snap list \| grep $gadget_name \| awk '{print $2}' > gadget_version
114	diff --git a/tests/integration/main/documentation-builds/task.yaml b/tests/integration/main/documentation-builds/task.yaml
115	index 7fef7b1..ccac8ae 100644
116	--- a/tests/integration/main/documentation-builds/task.yaml
117	+++ b/tests/integration/main/documentation-builds/task.yaml
118	@@ -1,5 +1,10 @@
119	1	summary: Verify the project documentation is building without errors	1	summary: Verify the project documentation is building without errors
120	2		2
121			3	systems:
122			4	# Do not run on real hardware as documentation-builder is not available in
123			5	# all archs.
124			6	- -hw-ubuntu-core-16
125			7
126	3	execute: \|	8	execute: \|
127	4	# Need to install in devmode as otherwise the snap can't access our project	9	# Need to install in devmode as otherwise the snap can't access our project
128	5	# home which is outside of the home directory of our current user.	10	# home which is outside of the home directory of our current user.
129	diff --git a/tests/integration/main/validate-manual-tests/task.yaml b/tests/integration/main/validate-manual-tests/task.yaml
130	index 1b8b481..8edd337 100644
131	--- a/tests/integration/main/validate-manual-tests/task.yaml
132	+++ b/tests/integration/main/validate-manual-tests/task.yaml
133	@@ -2,7 +2,7 @@ summary: Validate all manual plainbox test cases so that we don't ship any broke
134	2		2
135	3	execute: \|	3	execute: \|
136	4	snap install --devmode --beta classic	4	snap install --devmode --beta classic
138	5	cat <<-EOF > /home/test/validate-manual-tests.sh	5	cat <<-EOF > ${PROJECT_PATH}/validate-manual-tests.sh
139	6	#!/bin/sh	6	#!/bin/sh
140	7	set -ex	7	set -ex
141	8	apt update	8	apt update
142	@@ -13,5 +13,5 @@ execute: \|
143	13	python3 manage.py develop	13	python3 manage.py develop
144	14	python3 manage.py validate	14	python3 manage.py validate
145	15	EOF	15	EOF
148	16	chmod +x /home/test/validate-manual-tests.sh	16	chmod +x ${PROJECT_PATH}/validate-manual-tests.sh
149	17	sudo classic /home/test/validate-manual-tests.sh	17	sudo classic ${PROJECT_PATH}/validate-manual-tests.sh