Merge lp:~verterok/ols-jenkaas/move-some-to-xenial into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 657
Merged at revision: 657
Proposed branch: lp:~verterok/ols-jenkaas/move-some-to-xenial
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 133 lines (+7/-35)
10 files modified
jobs/canonical-identity-provider-mock-service.yaml (+1/-1)
jobs/canonical-identity-provider-mocksso.yaml (+1/-1)
jobs/canonical-identity-provider-ssoclient.yaml (+1/-1)
jobs/canonical-mojo-specs-mojo-ols-metrics.yaml (+1/-1)
jobs/canonical-mojo-specs-mojo-ols-mu.yaml (+1/-1)
jobs/canonical-mojo-specs-mojo-ols-snap-build.yaml (+1/-1)
jobs/canonical-mojo-specs-mojo-ue-push-service.yaml (+0/-9)
jobs/canonical-mojo-specs-online-services-deploy-utils.yaml (+1/-1)
jobs/ubuntu-push-server.yaml (+0/-9)
jobs/ubuntu-push.yaml (+0/-10)
To merge this branch: bzr merge lp:~verterok/ols-jenkaas/move-some-to-xenial
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+372927@code.launchpad.net

Commit message

move mojo spec and sso deps jobs to xenial and remove push spec job

To post a comment you must log in.
657. By Guillermo Gonzalez

remove push jobs too

Revision history for this message
Daniel Manrique (roadmr) wrote :

+1 cleanup

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/canonical-identity-provider-mock-service.yaml'
2--- jobs/canonical-identity-provider-mock-service.yaml 2018-08-09 13:08:26 +0000
3+++ jobs/canonical-identity-provider-mock-service.yaml 2019-09-18 08:48:09 +0000
4@@ -1,7 +1,7 @@
5 - project:
6 name: 'canonical-identity-provider-mock-service'
7 defaults: project
8- container: 'u1-trusty'
9+ container: 'u1-xenial'
10 trunk: 'lp:~ubuntuone-pqm-team/canonical-identity-provider/mock-service'
11 setup: '/bin/true'
12 landing-tests: '/bin/true'
13
14=== modified file 'jobs/canonical-identity-provider-mocksso.yaml'
15--- jobs/canonical-identity-provider-mocksso.yaml 2018-08-09 13:08:26 +0000
16+++ jobs/canonical-identity-provider-mocksso.yaml 2019-09-18 08:48:09 +0000
17@@ -1,7 +1,7 @@
18 - project:
19 name: 'canonical-identity-provider-mocksso'
20 defaults: project
21- container: 'u1-trusty'
22+ container: 'u1-xenial'
23 trunk: 'lp:~ubuntuone-pqm-team/canonical-identity-provider/mocksso'
24 setup: '/bin/true'
25 landing-tests: '/bin/true'
26
27=== modified file 'jobs/canonical-identity-provider-ssoclient.yaml'
28--- jobs/canonical-identity-provider-ssoclient.yaml 2018-08-09 13:08:26 +0000
29+++ jobs/canonical-identity-provider-ssoclient.yaml 2019-09-18 08:48:09 +0000
30@@ -1,7 +1,7 @@
31 - project:
32 name: 'canonical-identity-provider-ssoclient'
33 defaults: project
34- container: 'u1-trusty'
35+ container: 'u1-xenial'
36 trunk: 'lp:~ubuntuone-pqm-team/canonical-identity-provider/ssoclient'
37 setup: '/bin/true'
38 # FIXME: tox fails but wasn't used on ubuntone :-/ -- vila 2016-10-11
39
40=== modified file 'jobs/canonical-mojo-specs-mojo-ols-metrics.yaml'
41--- jobs/canonical-mojo-specs-mojo-ols-metrics.yaml 2017-03-20 17:09:16 +0000
42+++ jobs/canonical-mojo-specs-mojo-ols-metrics.yaml 2019-09-18 08:48:09 +0000
43@@ -1,7 +1,7 @@
44 - project:
45 name: 'canonical-mojo-specs-mojo-ols-metrics'
46 defaults: project
47- container: 'u1-trusty'
48+ container: 'u1-xenial'
49 trunk: 'lp:~ubuntuone-pqm-team/canonical-mojo-specs/mojo-ols-metrics'
50 setup: '/bin/true'
51 landing-tests: '/bin/true'
52
53=== modified file 'jobs/canonical-mojo-specs-mojo-ols-mu.yaml'
54--- jobs/canonical-mojo-specs-mojo-ols-mu.yaml 2017-03-20 17:09:16 +0000
55+++ jobs/canonical-mojo-specs-mojo-ols-mu.yaml 2019-09-18 08:48:09 +0000
56@@ -1,7 +1,7 @@
57 - project:
58 name: 'canonical-mojo-specs-mojo-ols-mu'
59 defaults: project
60- container: 'u1-trusty'
61+ container: 'u1-xenial'
62 trunk: 'lp:~ubuntuone-pqm-team/canonical-mojo-specs/mojo-ols-mu'
63 setup: '/bin/true'
64 landing-tests: '/bin/true'
65
66=== modified file 'jobs/canonical-mojo-specs-mojo-ols-snap-build.yaml'
67--- jobs/canonical-mojo-specs-mojo-ols-snap-build.yaml 2017-03-20 17:09:16 +0000
68+++ jobs/canonical-mojo-specs-mojo-ols-snap-build.yaml 2019-09-18 08:48:09 +0000
69@@ -1,7 +1,7 @@
70 - project:
71 name: 'canonical-mojo-specs-mojo-ols-snap-build'
72 defaults: project
73- container: 'u1-trusty'
74+ container: 'u1-xenial'
75 trunk: 'lp:~ubuntuone-pqm-team/canonical-mojo-specs/mojo-ols-snap-build'
76 setup: '/bin/true'
77 landing-tests: '/bin/true'
78
79=== removed file 'jobs/canonical-mojo-specs-mojo-ue-push-service.yaml'
80--- jobs/canonical-mojo-specs-mojo-ue-push-service.yaml 2017-03-20 17:09:16 +0000
81+++ jobs/canonical-mojo-specs-mojo-ue-push-service.yaml 1970-01-01 00:00:00 +0000
82@@ -1,9 +0,0 @@
83-- project:
84- name: 'canonical-mojo-specs-mojo-ue-push-service'
85- defaults: project
86- container: 'u1-trusty'
87- trunk: 'lp:~ubuntuone-pqm-team/canonical-mojo-specs/mojo-ue-push-service'
88- setup: '/bin/true'
89- landing-tests: '/bin/true'
90- jobs:
91- - 'land-{name}'
92
93=== modified file 'jobs/canonical-mojo-specs-online-services-deploy-utils.yaml'
94--- jobs/canonical-mojo-specs-online-services-deploy-utils.yaml 2017-03-20 17:09:16 +0000
95+++ jobs/canonical-mojo-specs-online-services-deploy-utils.yaml 2019-09-18 08:48:09 +0000
96@@ -1,7 +1,7 @@
97 - project:
98 name: 'canonical-mojo-specs-online-services-deploy-utils'
99 defaults: project
100- container: 'u1-trusty'
101+ container: 'u1-xenial'
102 trunk: 'lp:~ubuntuone-pqm-team/canonical-mojo-specs/online-services-deploy-utils'
103 setup: '/bin/true'
104 landing-tests: 'make test'
105
106=== removed file 'jobs/ubuntu-push-server.yaml'
107--- jobs/ubuntu-push-server.yaml 2017-03-20 17:09:16 +0000
108+++ jobs/ubuntu-push-server.yaml 1970-01-01 00:00:00 +0000
109@@ -1,9 +0,0 @@
110-- project:
111- defaults: project
112- name: 'ubuntu-push-server'
113- trunk: 'lp:ubuntu-push-server'
114- landing-tests: 'make check && make check-format'
115- # go requires a precise layout for the working dir
116- workdir: 'go-workspace/src/launchpad.net/{name}'
117- jobs:
118- - 'land-{name}'
119
120=== removed file 'jobs/ubuntu-push.yaml'
121--- jobs/ubuntu-push.yaml 2017-03-20 17:09:16 +0000
122+++ jobs/ubuntu-push.yaml 1970-01-01 00:00:00 +0000
123@@ -1,10 +0,0 @@
124-- project:
125- defaults: project
126- name: 'ubuntu-push'
127- trunk: 'lp:~ubuntu-push-server-hackers/{name}/trunk'
128- setup: 'make setup'
129- landing-tests: 'make test'
130- # go requires a precise layout for the working dir
131- workdir: 'go-workspace/src/launchpad.net/{name}'
132- jobs:
133- - 'land-{name}'

Subscribers

People subscribed via source and target branches