launchpad-reviewers team mailing list archive

[Colin Watson <mp+435077@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-clamav-database-url into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
Set clamav-database-url for launchpad-buildd-image-modifier

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/435077

See https://code.launchpad.net/~cjwatson/charm-launchpad-buildd-image-modifier/+git/charm-launchpad-buildd-image-modifier/+merge/432277.

This can't land until https://portal.admin.canonical.com/C155275 is resolved (for the DNS entries).
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-clamav-database-url into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 84fc456..1197410 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -1,4 +1,5 @@
 {%- if stage_name == "production" %}
+{%-   set clamav_database_url = "http://clamav-database-mirror.lp.internal/"; %}
 {%-   set content_id_template = "launchpad-buildd:production" %}
 {%-   set dns_update_host_bos01 = "10.189.0.2" %}
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
@@ -39,6 +40,7 @@
 {%-   set vbuilders_lgw01 = {"amd64": ("focal", 60, true)} %}
 {%-   set vbuilder_prefix = "" %}
 {%- else %}
+{%-   set clamav_database_url = "http://clamav-database-mirror.staging.lp.internal/"; %}
 {%-   set content_id_template = "launchpad-buildd:staging" %}
 {%-   set dns_update_host_bos01 = "10.189.0.2" %}
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
@@ -233,11 +235,13 @@ applications:
   launchpad-buildd-image-modifier-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
   launchpad-buildd-image-modifier-bos01-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
       remote-modifiers: '{{ modifiers_bos01 }}'
@@ -246,6 +250,7 @@ applications:
   launchpad-buildd-image-modifier-bos01-ppc64el:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos01 }}'
@@ -254,6 +259,7 @@ applications:
   launchpad-buildd-image-modifier-bos01-s390x:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos01 }}'
@@ -262,6 +268,7 @@ applications:
   launchpad-buildd-image-modifier-bos02-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
       remote-modifiers: '{{ modifiers_bos02 }}'
@@ -270,6 +277,7 @@ applications:
   launchpad-buildd-image-modifier-bos02-ppc64el:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos02 }}'
@@ -278,6 +286,7 @@ applications:
   launchpad-buildd-image-modifier-bos02-s390x:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
+      clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
       remote-modifiers: '{{ modifiers_bos02 }}'