launchpad-reviewers team mailing list archive

[Quentin Debhi <mp+482513@xxxxxxxxxxxxxxxxxx>]

Quentin Debhi has proposed merging ~ruinedyourlife/launchpad:lazr-conf-craft-builds into launchpad:master.

Commit message:
Add craftbuilds lazr conf for maven&cargo builds

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ruinedyourlife/launchpad/+git/launchpad/+merge/482513
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ruinedyourlife/launchpad:lazr-conf-craft-builds into launchpad:master.

diff --git a/charm/launchpad-buildd-manager/config.yaml b/charm/launchpad-buildd-manager/config.yaml
index 630ce00..71a10a9 100644
--- a/charm/launchpad-buildd-manager/config.yaml
+++ b/charm/launchpad-buildd-manager/config.yaml
@@ -52,6 +52,12 @@ options:
       YAML-encoded dictionary mapping pillars to dictionaries of
       configuration items to set for CI builds of those pillars.
     default: ""
+  craftbuild_config:
+    type: string
+    description: >
+      YAML-encoded dictionary mapping pillars to dictionaries of
+      configuration items to set for Craft builds of those pillars.
+    default: ""
   fetch_service_control_admin_secret:
     type: string
     description: >
diff --git a/charm/launchpad-buildd-manager/reactive/launchpad-buildd-manager.py b/charm/launchpad-buildd-manager/reactive/launchpad-buildd-manager.py
index 2f1b033..f617577 100644
--- a/charm/launchpad-buildd-manager/reactive/launchpad-buildd-manager.py
+++ b/charm/launchpad-buildd-manager/reactive/launchpad-buildd-manager.py
@@ -99,6 +99,7 @@ def configure():
         base.base_dir(), "buildd-manager"
     )
     config["cibuild_config"] = yaml.safe_load(config["cibuild_config"])
+    config["craftbuild_config"] = yaml.safe_load(config["craftbuild_config"])
     config["json"] = json
     host.mkdir(
         config["buildd_manager_dir"],
diff --git a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
index aed4cdf..20c4d31 100644
--- a/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
+++ b/charm/launchpad-buildd-manager/templates/launchpad-buildd-manager-lazr.conf
@@ -38,3 +38,11 @@ vm_resume_command: ssh -o StrictHostKeyChecking=no -i /home/{{ user }}/.ssh/buil
 {%- endfor %}
 {% endif %}
 
+{% if craftbuild_config -%}
+{% for pillar, config in craftbuild_config.items() -%}
+[craftbuild.{{ pillar }}]
+{%- for key, value in config.items() %}
+{{ key }}: {{ json.dumps(value) }}
+{%- endfor %}
+{%- endfor %}
+{% endif %}