ols-jenkaas

Merge lp:~maxiberta/ols-jenkaas/snapdeltas into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

  1. snapdeltas
  2. Merge into trunk
Proposed by Maximiliano Bertacchini
Status: Merged
Approved by: Daniel Manrique
Approved revision: 596
Merged at revision: 594
Proposed branch: lp:~maxiberta/ols-jenkaas/snapdeltas
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 47 lines (+15/-12)
3 files modified
jobs/snap-delta-service.yaml (+0/-11)
jobs/snapdeltas.yaml (+14/-0)
testing/pre-requisites (+1/-1)
To merge this branch: bzr merge lp:~maxiberta/ols-jenkaas/snapdeltas
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+348004@code.launchpad.net

Commit message

Replace old snap-delta-service jobs (trusty) by new snapdeltas jobs (xenial).

Description of the change

Replace old snap-delta-service jobs (trusty) by new snapdeltas jobs (xenial).

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'jobs/snap-delta-service.yaml'
2--- jobs/snap-delta-service.yaml 2017-03-20 17:09:16 +0000
3+++ jobs/snap-delta-service.yaml 1970-01-01 00:00:00 +0000
4@@ -1,11 +0,0 @@
5-- project:
6- name: 'snap-delta-service'
7- defaults: project
8- container: 'snap-delta-service'
9- vcs: 'git'
10- trunk: 'lp:~ubuntuone-hackers/snap-delta-service/+git/snap-delta-service'
11- deps-trunk: 'lp:~ubuntuone-hackers/snap-delta-service/+git/dependencies'
12- jobs:
13- - 'land-{name}-dependencies':
14- container: 'u1-trusty'
15- - 'land-{name}'
16
17=== added file 'jobs/snapdeltas.yaml'
18--- jobs/snapdeltas.yaml 1970-01-01 00:00:00 +0000
19+++ jobs/snapdeltas.yaml 2018-06-14 19:29:20 +0000
20@@ -0,0 +1,14 @@
21+- project:
22+ defaults: project
23+ name: 'snapdeltas'
24+ vcs: 'git'
25+ trunk: 'lp:snap-delta-service'
26+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make /home/ubuntu/siab-dependencies'
27+ landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make test'
28+ build-command: 'SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make charm-publish CHARM_NAME=snapdeltas && SNAPSTORE_DEPENDENCY_DIR=/home/ubuntu/siab-dependencies make charm-publish CHARM_NAME=snapdeltas-worker'
29+ deps-trunk: 'lp:~siab/+git/siab-dependencies'
30+ jobs:
31+ - 'land-{name}-dependencies'
32+ - 'land-{name}'
33+ - '{name}-build-charm'
34+ - 'trigger-{name}-build-charm-on-changes'
35
36=== modified file 'testing/pre-requisites'
37--- testing/pre-requisites 2017-02-28 08:59:57 +0000
38+++ testing/pre-requisites 2018-06-14 19:29:20 +0000
39@@ -15,7 +15,7 @@
40 PUBKEY=${PRIVKEY}.pub
41
42 if [ ! -f ${PRIVKEY} ] || [ ! -f ${PUBKEY} ] ; then
43- error "You need a passowrdless key for the slave"
44+ error "You need a passwordless key for the slave"
45 fi
46
47 (unset SSH_AGENT_PID SSH_AUTH_SOCK && \

Subscribers

People subscribed via source and target branches