ols-jenkaas

Merge lp:~verterok/ols-jenkaas/trigger-label into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

  1. trigger-label
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 588
Merged at revision: 588
Proposed branch: lp:~verterok/ols-jenkaas/trigger-label
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 139 lines (+14/-0)
7 files modified
jobs/my-ubuntu.yaml (+1/-0)
jobs/ols-charms-deps.yaml (+1/-0)
jobs/project-charm.yaml (+1/-0)
jobs/project-docker.yaml (+1/-0)
jobs/project-junit.yaml (+1/-0)
jobs/project-templates.yaml (+7/-0)
jobs/software-center-agent.yaml (+2/-0)
To merge this branch: bzr merge lp:~verterok/ols-jenkaas/trigger-label
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+343529@code.launchpad.net

Commit message

make all trigger jobs to run in production-triggers node

Description of the change

make all trigger jobs to run in production-triggers node

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

+1, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/my-ubuntu.yaml'
2--- jobs/my-ubuntu.yaml 2018-04-03 09:46:40 +0000
3+++ jobs/my-ubuntu.yaml 2018-04-18 15:24:47 +0000
4@@ -20,6 +20,7 @@
5 name: 'trigger-{name}-acceptance-tests-hourly'
6 description: 'Trigger {name} acceptance tests hourly'
7 defaults: project
8+ node: 'production-triggers'
9 disabled: !include: is-testing.yaml
10 project-type: freestyle
11 triggers:
12
13=== modified file 'jobs/ols-charms-deps.yaml'
14--- jobs/ols-charms-deps.yaml 2018-04-03 09:46:40 +0000
15+++ jobs/ols-charms-deps.yaml 2018-04-18 15:24:47 +0000
16@@ -18,6 +18,7 @@
17 - job-template:
18 name: 'trigger-{name}_{layer}'
19 defaults: project
20+ node: 'production-triggers'
21 description: 'Trigger {name}_{layer} landings on approved proposals'
22 disabled: !include: is-testing.yaml
23 trunk: 'lp:~ubuntuone-pqm-team/{name}/{layer}'
24
25=== modified file 'jobs/project-charm.yaml'
26--- jobs/project-charm.yaml 2018-04-03 09:46:40 +0000
27+++ jobs/project-charm.yaml 2018-04-18 15:24:47 +0000
28@@ -27,6 +27,7 @@
29 name: 'trigger-{charm-store}_{charm}'
30 description: 'Trigger {charm-store}_{charm} landings on approved proposals'
31 defaults: project
32+ node: 'production-triggers'
33 disabled: !include: is-testing.yaml
34 project-type: freestyle
35 triggers:
36
37=== modified file 'jobs/project-docker.yaml'
38--- jobs/project-docker.yaml 2018-04-13 14:32:52 +0000
39+++ jobs/project-docker.yaml 2018-04-18 15:24:47 +0000
40@@ -14,6 +14,7 @@
41 name: 'trigger-{name}-docker'
42 description: 'Trigger {name} landings on approved MPs using docker'
43 defaults: project
44+ node: 'production-triggers'
45 disabled: !include: is-testing.yaml
46 project-type: freestyle
47 triggers:
48
49=== modified file 'jobs/project-junit.yaml'
50--- jobs/project-junit.yaml 2018-04-04 08:17:47 +0000
51+++ jobs/project-junit.yaml 2018-04-18 15:24:47 +0000
52@@ -10,6 +10,7 @@
53 name: 'trigger-{name}-junit'
54 description: 'Trigger {name} landings on approved MPs'
55 defaults: project
56+ node: 'production-triggers'
57 disabled: !include: is-testing.yaml
58 project-type: freestyle
59 triggers:
60
61=== modified file 'jobs/project-templates.yaml'
62--- jobs/project-templates.yaml 2018-04-17 17:18:22 +0000
63+++ jobs/project-templates.yaml 2018-04-18 15:24:47 +0000
64@@ -19,6 +19,7 @@
65 name: 'trigger-{name}'
66 description: 'Trigger {name} landings on approved MPs'
67 defaults: project
68+ node: 'production-triggers'
69 disabled: !include: is-testing.yaml
70 project-type: freestyle
71 triggers:
72@@ -57,6 +58,7 @@
73 name: 'trigger-{name}-dependencies'
74 description: 'Trigger {name} dependencies landings on approved MPs'
75 defaults: project
76+ node: 'production-triggers'
77 disabled: !include: is-testing.yaml
78 project-type: freestyle
79 triggers:
80@@ -93,6 +95,7 @@
81 name: 'trigger-{name}-landing-tests-on-changes'
82 description: 'Trigger {name} landing tests on new commits'
83 defaults: project
84+ node: 'production-triggers'
85 disabled: !include: is-testing.yaml
86 project-type: freestyle
87 triggers:
88@@ -116,6 +119,7 @@
89 name: 'trigger-{name}-build-charm-on-changes'
90 description: 'Trigger {name} build-charm on new commits'
91 defaults: project
92+ node: 'production-triggers'
93 disabled: !include: is-testing.yaml
94 project-type: freestyle
95 triggers:
96@@ -139,6 +143,7 @@
97 name: 'trigger-{name}-staging-deploy-on-charm-changes'
98 description: 'Trigger {name} staging deploy on new charm builds'
99 defaults: project
100+ node: 'production-triggers'
101 disabled: !include: is-testing.yaml
102 project-type: freestyle
103 triggers:
104@@ -171,6 +176,7 @@
105 name: 'trigger-{name}-rollout-on-changes'
106 description: 'Trigger {name} rollouts on new commits'
107 defaults: project
108+ node: 'production-triggers'
109 disabled: !include: is-testing.yaml
110 project-type: freestyle
111 triggers:
112@@ -205,6 +211,7 @@
113 - job-template:
114 name: 'trigger-{name}-hourly'
115 defaults: project
116+ node: 'production-triggers'
117 description: 'Trigger the {name} hourly'
118 disabled: !include: is-testing.yaml
119 project-type: freestyle
120
121=== modified file 'jobs/software-center-agent.yaml'
122--- jobs/software-center-agent.yaml 2018-04-13 10:48:21 +0000
123+++ jobs/software-center-agent.yaml 2018-04-18 15:24:47 +0000
124@@ -39,6 +39,7 @@
125 name: 'trigger-{name}-landing-tests-for-branch'
126 description: 'Trigger landing tests on new {trunk} commits'
127 defaults: project
128+ node: 'production-triggers'
129 disabled: !include: is-testing.yaml
130 project-type: freestyle
131 triggers:
132@@ -74,6 +75,7 @@
133 name: 'trigger-{name}-ui-tests-on-changes'
134 description: 'Trigger ui tests on new {trunk} commits'
135 defaults: project
136+ node: 'production-triggers'
137 disabled: !include: is-testing.yaml
138 project-type: freestyle
139 triggers:

Subscribers

People subscribed via source and target branches