ols-jenkaas

Merge lp:~maxiberta/ols-jenkaas/explicitly-update-deps into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

  1. explicitly-update-deps
  2. Merge into trunk
Proposed by Maximiliano Bertacchini
Status: Merged
Merged at revision: 789
Proposed branch: lp:~maxiberta/ols-jenkaas/explicitly-update-deps
Merge into: lp:~ols-jenkaas-admins/ols-jenkaas/trunk
Diff against target: 203 lines (+16/-16)
15 files modified
jobs/franky.yaml (+1/-1)
jobs/packagereview.yaml (+2/-2)
jobs/publishergw.yaml (+1/-1)
jobs/snapauth.yaml (+1/-1)
jobs/snapdeltas.yaml (+1/-1)
jobs/snapdevicegw-charmimporter.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 (+1/-1)
jobs/snapservice.yaml (+1/-1)
jobs/snapstats.yaml (+1/-1)
jobs/snapstore-common.yaml (+1/-1)
jobs/software-center-agent.yaml (+1/-1)
To merge this branch: bzr merge lp:~maxiberta/ols-jenkaas/explicitly-update-deps
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Review via email: mp+405415@code.launchpad.net

Commit message

Explicitly update the shared dependencies cache during setup

To post a comment you must log in.
lp:~maxiberta/ols-jenkaas/explicitly-update-deps updated
790. By Maximiliano Bertacchini

Attempt to fix failing sca landing tests

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/franky.yaml'
2--- jobs/franky.yaml 2021-07-08 16:08:47 +0000
3+++ jobs/franky.yaml 2021-07-08 19:11:42 +0000
4@@ -3,7 +3,7 @@
5 name: 'franky'
6 vcs: 'git'
7 trunk: 'lp:franky'
8- setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap charm-collect'
9+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap update-dependencies charm-collect'
10 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make test charm-unittest'
11 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
12 charm-repo: 'lp:~ubuntuone-pqm-team/franky/+git/charm-build-franky'
13
14=== modified file 'jobs/packagereview.yaml'
15--- jobs/packagereview.yaml 2021-07-08 16:08:47 +0000
16+++ jobs/packagereview.yaml 2021-07-08 19:11:42 +0000
17@@ -3,7 +3,7 @@
18 name: 'packagereview'
19 vcs: 'git'
20 trunk: 'lp:packagereview'
21- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
22+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
23 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
24 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview'
25 deps-trunk: 'lp:~siab/+git/siab-dependencies'
26@@ -21,7 +21,7 @@
27 name: 'packagereview-worker'
28 vcs: 'git'
29 trunk: 'lp:packagereview'
30- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
31+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
32 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview-worker'
33 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview-worker'
34 deploy-group: 'snap-store'
35
36=== modified file 'jobs/publishergw.yaml'
37--- jobs/publishergw.yaml 2021-07-08 16:08:47 +0000
38+++ jobs/publishergw.yaml 2021-07-08 19:11:42 +0000
39@@ -3,7 +3,7 @@
40 name: 'publishergw'
41 vcs: 'git'
42 trunk: 'lp:publishergw'
43- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies setup-jenkaas'
44+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies setup-jenkaas'
45 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing-tests'
46 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
47 deps-trunk: 'lp:~siab/+git/siab-dependencies'
48
49=== modified file 'jobs/snapauth.yaml'
50--- jobs/snapauth.yaml 2021-07-08 16:08:47 +0000
51+++ jobs/snapauth.yaml 2021-07-08 19:11:42 +0000
52@@ -3,7 +3,7 @@
53 name: 'snapauth'
54 vcs: 'git'
55 trunk: 'lp:snapauth'
56- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
57+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
58 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
59 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
60 deps-trunk: 'lp:~siab/+git/siab-dependencies'
61
62=== modified file 'jobs/snapdeltas.yaml'
63--- jobs/snapdeltas.yaml 2021-07-08 16:08:47 +0000
64+++ jobs/snapdeltas.yaml 2021-07-08 19:11:42 +0000
65@@ -3,7 +3,7 @@
66 name: 'snapdeltas'
67 vcs: 'git'
68 trunk: 'lp:snap-delta-service'
69- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
70+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
71 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
72 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapdeltas && SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapdeltas-worker'
73 deps-trunk: 'lp:~siab/+git/siab-dependencies'
74
75=== modified file 'jobs/snapdevicegw-charmimporter.yaml'
76--- jobs/snapdevicegw-charmimporter.yaml 2021-07-08 16:08:47 +0000
77+++ jobs/snapdevicegw-charmimporter.yaml 2021-07-08 19:11:42 +0000
78@@ -4,7 +4,7 @@
79 container: 'charm-importer'
80 vcs: 'git'
81 trunk: 'lp:~ubuntuone-hackers/snapdevicegw/+git/charmstore-migration'
82- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies bootstrap'
83+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
84 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make test'
85 jobs:
86 # Listing jobs explicitly to avoid the trigger which is not needed
87
88=== modified file 'jobs/snapdevicegw.yaml'
89--- jobs/snapdevicegw.yaml 2021-07-08 16:08:47 +0000
90+++ jobs/snapdevicegw.yaml 2021-07-08 19:11:42 +0000
91@@ -3,7 +3,7 @@
92 name: 'snapdevicegw'
93 vcs: 'git'
94 trunk: 'lp:snapdevicegw'
95- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies setup-jenkaas'
96+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies setup-jenkaas'
97 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing-tests'
98 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
99 deps-trunk: 'lp:~siab/+git/siab-dependencies'
100
101=== modified file 'jobs/snapfind.yaml'
102--- jobs/snapfind.yaml 2021-07-08 16:08:47 +0000
103+++ jobs/snapfind.yaml 2021-07-08 19:11:42 +0000
104@@ -3,7 +3,7 @@
105 name: 'snapfind'
106 vcs: 'git'
107 trunk: 'lp:snapfind'
108- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
109+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
110 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
111 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
112 deps-trunk: 'lp:~siab/+git/siab-dependencies'
113
114=== modified file 'jobs/snapident.yaml'
115--- jobs/snapident.yaml 2021-07-08 16:08:47 +0000
116+++ jobs/snapident.yaml 2021-07-08 19:11:42 +0000
117@@ -3,7 +3,7 @@
118 name: 'snapident'
119 vcs: 'git'
120 trunk: 'lp:snapident'
121- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
122+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
123 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make test'
124 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
125 deps-trunk: 'lp:~siab/+git/siab-dependencies'
126
127=== modified file 'jobs/snapmodels.yaml'
128--- jobs/snapmodels.yaml 2021-07-08 16:08:47 +0000
129+++ jobs/snapmodels.yaml 2021-07-08 19:11:42 +0000
130@@ -3,7 +3,7 @@
131 name: 'snapmodels'
132 vcs: 'git'
133 trunk: 'lp:snapmodels'
134- setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap charm-collect'
135+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap update-dependencies charm-collect'
136 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing charm-unittest'
137 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
138 charm-repo: 'lp:~ubuntuone-pqm-team/snapmodels/+git/charm-build-snapmodels'
139
140=== modified file 'jobs/snaprevs.yaml'
141--- jobs/snaprevs.yaml 2021-07-08 16:08:47 +0000
142+++ jobs/snaprevs.yaml 2021-07-08 19:11:42 +0000
143@@ -3,7 +3,7 @@
144 name: 'snaprevs'
145 vcs: 'git'
146 trunk: 'lp:snaprevs'
147- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
148+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
149 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
150 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'
151 deps-trunk: 'lp:~siab/+git/siab-dependencies'
152
153=== modified file 'jobs/snapservice.yaml'
154--- jobs/snapservice.yaml 2021-07-08 16:08:47 +0000
155+++ jobs/snapservice.yaml 2021-07-08 19:11:42 +0000
156@@ -3,7 +3,7 @@
157 name: 'snapservice'
158 vcs: 'git'
159 trunk: 'lp:~ubuntuone-pqm-team/snapstore-common/+git/snapservice'
160- setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap charm-collect'
161+ setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap update-dependencies charm-collect'
162 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make test charm-unittest'
163 jobs:
164 - 'land-{name}'
165
166=== modified file 'jobs/snapstats.yaml'
167--- jobs/snapstats.yaml 2021-07-08 16:08:47 +0000
168+++ jobs/snapstats.yaml 2021-07-08 19:11:42 +0000
169@@ -3,7 +3,7 @@
170 name: 'snapstats'
171 vcs: 'git'
172 trunk: 'lp:snapstats'
173- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
174+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
175 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels SETUP_DB_ARGS=--force make setup-db landing'
176 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats && SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-miner && SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=snapstats-realtime'
177 deps-trunk: 'lp:~siab/+git/siab-dependencies'
178
179=== modified file 'jobs/snapstore-common.yaml'
180--- jobs/snapstore-common.yaml 2021-07-08 16:08:47 +0000
181+++ jobs/snapstore-common.yaml 2021-07-08 19:11:42 +0000
182@@ -3,7 +3,7 @@
183 name: 'snapstore-common'
184 vcs: 'git'
185 trunk: 'lp:snapstore-common'
186- setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make /workspace/siab-dependencies'
187+ setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
188 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make test'
189 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make wheel'
190 deps-trunk: 'lp:~siab/+git/siab-dependencies'
191
192=== modified file 'jobs/software-center-agent.yaml'
193--- jobs/software-center-agent.yaml 2021-07-08 16:08:47 +0000
194+++ jobs/software-center-agent.yaml 2021-07-08 19:11:42 +0000
195@@ -5,7 +5,7 @@
196 trunk: 'lp:software-center-agent'
197 vcs: 'git'
198 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap makemessages'
199- landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make start-db && CONCURRENCY=6 ./run-landing-tests'
200+ landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make start-db && OLS_WHEELS_DIR=/workspace/ols-wheels CONCURRENCY=6 ./run-landing-tests'
201 deps-trunk: 'lp:~ubuntuone-pqm-team/software-center-agent/+git/dependencies'
202 charm-vcs: 'git'
203 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/software-center-agent/+git/builds'

Subscribers

People subscribed via source and target branches