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
=== modified file 'jobs/charmlibs.yaml'
--- jobs/charmlibs.yaml 2022-12-12 06:22:14 +0000
+++ jobs/charmlibs.yaml 2023-01-23 05:38:00 +0000
@@ -3,9 +3,9 @@
3 name: 'charmlibs'3 name: 'charmlibs'
4 vcs: 'git'4 vcs: 'git'
5 trunk: 'lp:charmlibs'5 trunk: 'lp:charmlibs'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap charm-collect'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap charm-collect'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing charm-unittest'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing charm-unittest'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/charmlibs/+git/charm-build-charmlibs'9 charm-repo: 'lp:~ubuntuone-pqm-team/charmlibs/+git/charm-build-charmlibs'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/franky.yaml'
--- jobs/franky.yaml 2021-07-08 18:40:05 +0000
+++ jobs/franky.yaml 2023-01-23 05:38:00 +0000
@@ -3,9 +3,9 @@
3 name: 'franky'3 name: 'franky'
4 vcs: 'git'4 vcs: 'git'
5 trunk: 'lp:franky'5 trunk: 'lp:franky'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make bootstrap update-dependencies charm-collect'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap charm-collect'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make test charm-unittest'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make test charm-unittest'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/franky/+git/charm-build-franky'9 charm-repo: 'lp:~ubuntuone-pqm-team/franky/+git/charm-build-franky'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/packagereview.yaml'
--- jobs/packagereview.yaml 2021-07-08 18:40:05 +0000
+++ jobs/packagereview.yaml 2023-01-23 05:38:00 +0000
@@ -3,9 +3,9 @@
3 name: 'packagereview'3 name: 'packagereview'
4 vcs: 'git'4 vcs: 'git'
5 trunk: 'lp:packagereview'5 trunk: 'lp:packagereview'
6 setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview' 8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=packagereview'
9 deps-trunk: 'lp:~siab/+git/siab-dependencies'9 deps-trunk: 'lp:~siab/+git/siab-dependencies'
10 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview'10 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview'
11 deploy-group: 'snap-store'11 deploy-group: 'snap-store'
@@ -21,8 +21,8 @@
21 name: 'packagereview-worker'21 name: 'packagereview-worker'
22 vcs: 'git'22 vcs: 'git'
23 trunk: 'lp:packagereview'23 trunk: 'lp:packagereview'
24 setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'24 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
25 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview-worker'25 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish CHARM_NAME=packagereview-worker'
26 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview-worker'26 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview-worker'
27 deploy-group: 'snap-store'27 deploy-group: 'snap-store'
28 jobs:28 jobs:
2929
=== modified file 'jobs/publishergw.yaml'
--- jobs/publishergw.yaml 2023-01-09 04:08:58 +0000
+++ jobs/publishergw.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:publishergw'5 trunk: 'lp:publishergw'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/publishergw/+git/charm-build'9 charm-repo: 'lp:~ubuntuone-pqm-team/publishergw/+git/charm-build'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapauth.yaml'
--- jobs/snapauth.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapauth.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapauth'5 trunk: 'lp:snapauth'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapauth/+git/charm-build'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapauth/+git/charm-build'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapdeltas.yaml'
--- jobs/snapdeltas.yaml 2023-01-09 07:18:45 +0000
+++ jobs/snapdeltas.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snap-delta-service'5 trunk: 'lp:snap-delta-service'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 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'8 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'
9 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snap-delta-service/+git/charm-build-snapdeltas'9 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snap-delta-service/+git/charm-build-snapdeltas'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapdevicegw.yaml'
--- jobs/snapdevicegw.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapdevicegw.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapdevicegw'5 trunk: 'lp:snapdevicegw'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapdevicegw/+git/charm-build'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapdevicegw/+git/charm-build'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapfind.yaml'
--- jobs/snapfind.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapfind.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapfind'5 trunk: 'lp:snapfind'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapfind/+git/charm-build'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapfind/+git/charm-build'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapident.yaml'
--- jobs/snapident.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapident.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapident'5 trunk: 'lp:snapident'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapident/+git/charm-build'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapident/+git/charm-build'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snapmodels.yaml'
--- jobs/snapmodels.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapmodels.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapmodels'5 trunk: 'lp:snapmodels'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapmodels/+git/charm-build-snapmodels'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapmodels/+git/charm-build-snapmodels'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:
1212
=== modified file 'jobs/snaprevs.yaml'
--- jobs/snaprevs.yaml 2021-07-08 18:40:05 +0000
+++ jobs/snaprevs.yaml 2023-01-23 05:38:00 +0000
@@ -3,9 +3,9 @@
3 name: 'snaprevs'3 name: 'snaprevs'
4 vcs: 'git'4 vcs: 'git'
5 trunk: 'lp:snaprevs'5 trunk: 'lp:snaprevs'
6 setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish'8 build-command: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies charm-publish'
9 deps-trunk: 'lp:~siab/+git/siab-dependencies'9 deps-trunk: 'lp:~siab/+git/siab-dependencies'
10 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snaprevs/+git/charm-build'10 charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/snaprevs/+git/charm-build'
11 deploy-group: 'snap-store'11 deploy-group: 'snap-store'
1212
=== modified file 'jobs/snapstats.yaml'
--- jobs/snapstats.yaml 2023-01-09 04:08:58 +0000
+++ jobs/snapstats.yaml 2023-01-23 05:38:00 +0000
@@ -5,7 +5,7 @@
5 trunk: 'lp:snapstats'5 trunk: 'lp:snapstats'
6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'6 setup: 'OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies bootstrap'
7 landing-tests: 'sudo systemctl restart cassandra && OLS_WHEELS_DIR=/workspace/ols-wheels make landing'7 landing-tests: 'sudo systemctl restart cassandra && OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
8 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'8 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'
9 charm-repo: 'lp:~ubuntuone-pqm-team/snapstats/+git/charm-build-snapstats'9 charm-repo: 'lp:~ubuntuone-pqm-team/snapstats/+git/charm-build-snapstats'
10 deploy-group: 'snap-store'10 deploy-group: 'snap-store'
11 jobs:11 jobs:

Subscribers

People subscribed via source and target branches