ols-jenkaas

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

  1. snapdevicegw-new-make-targets
  2. Merge into trunk
Proposed by Simon Davy
Status: Merged
Approved by: Simon Davy
Approved revision: 592
Merged at revision: 591
Proposed branch: lp:~bloodearnest/ols-jenkaas/snapdevicegw-new-make-targets
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 25 lines (+3/-1)
2 files modified
doc/secrets.rst (+2/-0)
jobs/snapdevicegw.yaml (+1/-1)
To merge this branch: bzr merge lp:~bloodearnest/ols-jenkaas/snapdevicegw-new-make-targets
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+346411@code.launchpad.net

Commit message

Use new make targets for snapdevicegw

To post a comment you must log in.
lp:~bloodearnest/ols-jenkaas/snapdevicegw-new-make-targets updated
592. By Simon Davy

remove custom charm-publish target

Revision history for this message
Adam Collard (adam-collard) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/secrets.rst'
2--- doc/secrets.rst 2017-03-20 17:09:16 +0000
3+++ doc/secrets.rst 2018-05-22 09:38:21 +0000
4@@ -46,6 +46,8 @@
5 secrets
6 ols-store-tests/
7 secrets
8+ snapstore-snap/
9+ store-key
10 # Credentials needed to setup the containers on the slaves
11 slave-etc-ols-vms.conf
12
13
14=== modified file 'jobs/snapdevicegw.yaml'
15--- jobs/snapdevicegw.yaml 2017-07-10 21:47:49 +0000
16+++ jobs/snapdevicegw.yaml 2018-05-22 09:38:21 +0000
17@@ -4,7 +4,7 @@
18 vcs: 'git'
19 trunk: 'lp:snapdevicegw'
20 setup: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make /home/ubuntu/siab-dependencies'
21- landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make test'
22+ landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make landing-tests'
23 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make charm-publish'
24 deps-trunk: 'lp:~siab/+git/siab-dependencies'
25 jobs:

Subscribers

People subscribed via source and target branches