ols-jenkaas

Merge lp:~woutervb/ols-jenkaas/update_before_charm_build_all_siab_services into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

  1. update_before_charm_build_all_siab_services
  2. Merge into trunk
Proposed by Wouter van Bommel
Status: Merged
Approved by: William Grant
Approved revision: 863
Merged at revision: 863
Proposed branch: lp:~woutervb/ols-jenkaas/update_before_charm_build_all_siab_services
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 180 lines (+20/-20)
12 files modified
jobs/charmlibs.yaml (+2/-2)
jobs/franky.yaml (+2/-2)
jobs/packagereview.yaml (+5/-5)
jobs/publishergw.yaml (+1/-1)
jobs/snapauth.yaml (+1/-1)
jobs/snapdeltas.yaml (+1/-1)
jobs/snapdevicegw.yaml (+1/-1)
jobs/snapfind.yaml (+1/-1)
jobs/snapident.yaml (+1/-1)
jobs/snapmodels.yaml (+1/-1)
jobs/snaprevs.yaml (+3/-3)
jobs/snapstats.yaml (+1/-1)
To merge this branch: bzr merge lp:~woutervb/ols-jenkaas/update_before_charm_build_all_siab_services
Reviewer Review Type Date Requested Status
Tong Shinn Approve
Review via email: mp+436178@code.launchpad.net

Commit message

Make sure that we update the python dependencies before we build the charm

This change is needed, as it can happen that the charm build takes place on
another jenkins builder then were the code was tested, which means that the
checked out ols-jenkaas won't be up-to-date

To post a comment you must log in.
Revision history for this message
Tong Shinn (tshinn) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/charmlibs.yaml'
2--- jobs/charmlibs.yaml 2022-12-12 06:22:14 +0000
3+++ jobs/charmlibs.yaml 2023-01-23 05:38:00 +0000
4@@ -3,9 +3,9 @@
5 name: 'charmlibs'
6 vcs: 'git'
7 trunk: 'lp:charmlibs'
8- setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap charm-collect'
9+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap charm-collect'
10 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing charm-unittest'
11- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
12+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
13 charm-repo: 'lp:~ubuntuone-pqm-team/charmlibs/+git/charm-build-charmlibs'
14 deploy-group: 'snap-store'
15 jobs:
16
17=== modified file 'jobs/franky.yaml'
18--- jobs/franky.yaml 2021-07-08 18:40:05 +0000
19+++ jobs/franky.yaml 2023-01-23 05:38:00 +0000
20@@ -3,9 +3,9 @@
21 name: 'franky'
22 vcs: 'git'
23 trunk: 'lp:franky'
24- setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap update-dependencies charm-collect'
25+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap charm-collect'
26 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make test charm-unittest'
27- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
28+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
29 charm-repo: 'lp:~ubuntuone-pqm-team/franky/+git/charm-build-franky'
30 deploy-group: 'snap-store'
31 jobs:
32
33=== modified file 'jobs/packagereview.yaml'
34--- jobs/packagereview.yaml 2021-07-08 18:40:05 +0000
35+++ jobs/packagereview.yaml 2023-01-23 05:38:00 +0000
36@@ -3,9 +3,9 @@
37 name: 'packagereview'
38 vcs: 'git'
39 trunk: 'lp:packagereview'
40- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
41- landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
42- build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview'
43+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
44+ landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
45+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=packagereview'
46 deps-trunk: 'lp:~siab/+git/siab-dependencies'
47 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview'
48 deploy-group: 'snap-store'
49@@ -21,8 +21,8 @@
50 name: 'packagereview-worker'
51 vcs: 'git'
52 trunk: 'lp:packagereview'
53- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
54- build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview-worker'
55+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
56+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=packagereview-worker'
57 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview-worker'
58 deploy-group: 'snap-store'
59 jobs:
60
61=== modified file 'jobs/publishergw.yaml'
62--- jobs/publishergw.yaml 2023-01-09 04:08:58 +0000
63+++ jobs/publishergw.yaml 2023-01-23 05:38:00 +0000
64@@ -5,7 +5,7 @@
65 trunk: 'lp:publishergw'
66 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
67 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
68- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
69+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
70 charm-repo: 'lp:~ubuntuone-pqm-team/publishergw/+git/charm-build'
71 deploy-group: 'snap-store'
72 jobs:
73
74=== modified file 'jobs/snapauth.yaml'
75--- jobs/snapauth.yaml 2023-01-09 04:08:58 +0000
76+++ jobs/snapauth.yaml 2023-01-23 05:38:00 +0000
77@@ -5,7 +5,7 @@
78 trunk: 'lp:snapauth'
79 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
80 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
81- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
82+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
83 charm-repo: 'lp:~ubuntuone-pqm-team/snapauth/+git/charm-build'
84 deploy-group: 'snap-store'
85 jobs:
86
87=== modified file 'jobs/snapdeltas.yaml'
88--- jobs/snapdeltas.yaml 2023-01-09 07:18:45 +0000
89+++ jobs/snapdeltas.yaml 2023-01-23 05:38:00 +0000
90@@ -5,7 +5,7 @@
91 trunk: 'lp:snap-delta-service'
92 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
93 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
94- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapdeltas && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapdeltas-worker'
95+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=snapdeltas && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapdeltas-worker'
96 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snap-delta-service/+git/charm-build-snapdeltas'
97 deploy-group: 'snap-store'
98 jobs:
99
100=== modified file 'jobs/snapdevicegw.yaml'
101--- jobs/snapdevicegw.yaml 2023-01-09 04:08:58 +0000
102+++ jobs/snapdevicegw.yaml 2023-01-23 05:38:00 +0000
103@@ -5,7 +5,7 @@
104 trunk: 'lp:snapdevicegw'
105 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
106 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
107- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
108+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
109 charm-repo: 'lp:~ubuntuone-pqm-team/snapdevicegw/+git/charm-build'
110 deploy-group: 'snap-store'
111 jobs:
112
113=== modified file 'jobs/snapfind.yaml'
114--- jobs/snapfind.yaml 2023-01-09 04:08:58 +0000
115+++ jobs/snapfind.yaml 2023-01-23 05:38:00 +0000
116@@ -5,7 +5,7 @@
117 trunk: 'lp:snapfind'
118 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
119 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
120- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
121+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
122 charm-repo: 'lp:~ubuntuone-pqm-team/snapfind/+git/charm-build'
123 deploy-group: 'snap-store'
124 jobs:
125
126=== modified file 'jobs/snapident.yaml'
127--- jobs/snapident.yaml 2023-01-09 04:08:58 +0000
128+++ jobs/snapident.yaml 2023-01-23 05:38:00 +0000
129@@ -5,7 +5,7 @@
130 trunk: 'lp:snapident'
131 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
132 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
133- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
134+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
135 charm-repo: 'lp:~ubuntuone-pqm-team/snapident/+git/charm-build'
136 deploy-group: 'snap-store'
137 jobs:
138
139=== modified file 'jobs/snapmodels.yaml'
140--- jobs/snapmodels.yaml 2023-01-09 04:08:58 +0000
141+++ jobs/snapmodels.yaml 2023-01-23 05:38:00 +0000
142@@ -5,7 +5,7 @@
143 trunk: 'lp:snapmodels'
144 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
145 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
146- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
147+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
148 charm-repo: 'lp:~ubuntuone-pqm-team/snapmodels/+git/charm-build-snapmodels'
149 deploy-group: 'snap-store'
150 jobs:
151
152=== modified file 'jobs/snaprevs.yaml'
153--- jobs/snaprevs.yaml 2021-07-08 18:40:05 +0000
154+++ jobs/snaprevs.yaml 2023-01-23 05:38:00 +0000
155@@ -3,9 +3,9 @@
156 name: 'snaprevs'
157 vcs: 'git'
158 trunk: 'lp:snaprevs'
159- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
160- landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
161- build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
162+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
163+ landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
164+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
165 deps-trunk: 'lp:~siab/+git/siab-dependencies'
166 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snaprevs/+git/charm-build'
167 deploy-group: 'snap-store'
168
169=== modified file 'jobs/snapstats.yaml'
170--- jobs/snapstats.yaml 2023-01-09 04:08:58 +0000
171+++ jobs/snapstats.yaml 2023-01-23 05:38:00 +0000
172@@ -5,7 +5,7 @@
173 trunk: 'lp:snapstats'
174 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
175 landing-tests: 'sudo systemctl restart cassandra && OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
176- build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-miner && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-realtime'
177+ build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=snapstats && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-miner && OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-realtime'
178 charm-repo: 'lp:~ubuntuone-pqm-team/snapstats/+git/charm-build-snapstats'
179 deploy-group: 'snap-store'
180 jobs:

Subscribers

People subscribed via source and target branches