Merge lp:~maxiberta/ols-jenkaas/packagereview-job-add-build-setup-command into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Maximiliano Bertacchini]

Update deps prior to building the packagereview charm

The landing job has a "setup" setup prior to running, where most projects run `make update-dependencies`. The charm build job, otoh, has no explicit setup step (it's /bin/true, actually).

Should fix "ERROR: Could not find a version that satisfies the requirement snapstore-schemas==1.75 (from -r requirements.txt (line 96)) (from versions: 0.98, 1.13, 1.18, 1.19, 1.20, 1.23, 1.27, 1.28, 1.30, 1.31, 1.33, 1.34, 1.41, 1.61, 1.62, 1.63, 1.64, 1.65, 1.66, 1.67, 1.68, 1.69, 1.70, 1.71, 1.72, 1.73, 1.74)" (e.g. https://jenkins.ols.canonical.com/online-services/job/packagereview-build-charm/355/console). Most probably caused by the landing job and charm build job running in a different workers, and deps updated in the former only.

Alternatively, and more aggressively, could update the {name}-build-charm template to run '{setup}' instead of /bin/true.

Check commit messages for details.

Unmerged revisions

837. By Maximiliano Bertacchini on 2022-07-19

Add a build-setup-command to the packagereview charm build job

836. By Maximiliano Bertacchini on 2022-07-19

Extend the {name}-build-charm job template to support a custom setup command

As a result, job templates {name}-build-charm and {name}-build-asset are identical.

=== modified file 'jobs/packagereview.yaml'
--- jobs/packagereview.yaml	2021-07-08 18:40:05 +0000
+++ jobs/packagereview.yaml	2022-07-19 19:48:16 +0000
@@ -5,6 +5,7 @@
     trunk: 'lp:packagereview'
     setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
     landing-tests: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make landing'
+    build-setup-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
     build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview' 
     deps-trunk: 'lp:~siab/+git/siab-dependencies'
     charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview'
@@ -22,6 +23,7 @@
     vcs: 'git'
     trunk: 'lp:packagereview'
     setup: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
+    build-setup-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make update-dependencies'
     build-command: 'SNAPSTORE_DEPENDENCY_DIR=/workspace/siab-dependencies OLS_WHEELS_DIR=/workspace/ols-wheels make charm-publish CHARM_NAME=packagereview-worker'
     charm-repo: 'ssh://git.launchpad.net/~ubuntuone-pqm-team/packagereview/+git/charm-build-packagereview-worker'
     deploy-group: 'snap-store'

=== modified file 'jobs/project-charm.yaml'
--- jobs/project-charm.yaml	2021-05-05 13:18:49 +0000
+++ jobs/project-charm.yaml	2022-07-19 19:48:16 +0000
@@ -5,21 +5,11 @@
         - '{charm-store}_{charm}'
         - '{charm-store}_{charm}-landing-tests'
 
-- job-template:
+- job-template: &build-charm-job-template
     name: '{name}-build-charm'
     defaults: project
     description: 'Build charm for {name}'
     project-type: freestyle
-    builders:
-      - shell: annotate-output ~/jenkaas/project/run-tests {vcs} {trunk} {container} '/bin/true' 'with-credentials {build-command}' {workdir}
-    publishers:
-      - mattermost-snapstore
-
-- job-template:
-    name: '{name}-build-asset'
-    defaults: project
-    description: 'Build and publish assets for {name}'
-    project-type: freestyle
     build-setup-command: '/bin/true'
     builders:
       - shell: annotate-output ~/jenkaas/project/run-tests {vcs} {trunk} {container} '{build-setup-command}' 'with-credentials {build-command}' {workdir}
@@ -27,6 +17,10 @@
       - mattermost-snapstore
 
 - job-template:
+    name: '{name}-build-asset'
+    <<: *build-charm-job-template
+
+- job-template:
     name: 'trigger-{charm-store}_{charm}'
     description: 'Trigger {charm-store}_{charm} landings on approved proposals'
     defaults: project