Merge lp:~bloodearnest/ols-jenkaas/snapdevicegw-new-make-targets into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Simon Davy]

Use new make targets for snapdevicegw

[lp:~bloodearnest/ols-jenkaas/snapdevicegw-new-make-targets]

592. By Simon Davy on 2018-05-22

remove custom charm-publish target

[Adam Collard (adam-collard)]

review: Approve

=== modified file 'doc/secrets.rst'
--- doc/secrets.rst	2017-03-20 17:09:16 +0000
+++ doc/secrets.rst	2018-05-22 09:38:21 +0000
@@ -46,6 +46,8 @@
     secrets
   ols-store-tests/
     secrets
+  snapstore-snap/
+    store-key
   # Credentials needed to setup the containers on the slaves
   slave-etc-ols-vms.conf
 
 
=== modified file 'jobs/snapdevicegw.yaml'
--- jobs/snapdevicegw.yaml	2017-07-10 21:47:49 +0000
+++ jobs/snapdevicegw.yaml	2018-05-22 09:38:21 +0000
@@ -4,7 +4,7 @@
     vcs: 'git'
     trunk: 'lp:snapdevicegw'
     setup: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make /home/ubuntu/siab-dependencies'
-    landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make test'
+    landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make landing-tests'
     build-command: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make charm-publish'
     deps-trunk: 'lp:~siab/+git/siab-dependencies'
     jobs: