From 2364d11684ecf5a618b20f640cf504dc32ed8835 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 6 Jun 2018 21:59:33 +0200 Subject: [PATCH] Add build_from parameter to osbs.conf on koji builders Signed-off-by: Clement Verna --- playbooks/groups/buildvm.yml | 3 ++- roles/osbs-client/templates/osbs.conf.j2 | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index b2091e5801..871b7736a1 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -120,7 +120,8 @@ builder_pdc_url: "https://pdc.stg.fedoraproject.org/api/1", flatpak_base_image: "registry.fedoraproject.org/fedora:28", reactor_config_map: "reactor-config-map", - reactor_config_map_scratch: "reactor-config-map-scratch" + reactor_config_map_scratch: "reactor-config-map-scratch", + build_from: "image:buildroot:latest" } } - { diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2 index 1d11ff67ac..cbfd7872c4 100644 --- a/roles/osbs-client/templates/osbs.conf.j2 +++ b/roles/osbs-client/templates/osbs.conf.j2 @@ -98,6 +98,10 @@ flatpak_base_image = {{ default.flatpak_base_image }} reactor_config_map = {{ default.reactor_config_map }} {% endif %} +{% if default.build_from is defined %} +build_from = {{ default.build_from }} +{% endif %} + [scratch] scratch = true {% if default.username is defined %} @@ -187,4 +191,8 @@ flatpak_base_image = {{ default.flatpak_base_image }} {% if default.reactor_config_map_scratch is defined %} reactor_config_map = {{ default.reactor_config_map_scratch }} +{% endif %} + +{% if default.build_from is defined %} +build_from = {{ default.build_from }} {% endif %} \ No newline at end of file