Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Add build_from parameter to osbs.conf on koji builders

Browse source 
Signed-off-by: Clement Verna <cverna@tutanota.com>
This commit is contained in:
Clement Verna 2018-06-06 21:59:33 +02:00
parent 922088d494
commit 2364d11684
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
playbooks/groups/buildvm.yml
View file

@ -120,7 +120,8 @@
builder_pdc_url: "https://pdc.stg.fedoraproject.org/api/1", builder_pdc_url: "https://pdc.stg.fedoraproject.org/api/1",
flatpak_base_image: "registry.fedoraproject.org/fedora:28", flatpak_base_image: "registry.fedoraproject.org/fedora:28",
reactor_config_map: "reactor-config-map", 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"
} }
} }
- { - {

8
roles/osbs-client/templates/osbs.conf.j2
View file

@ -98,6 +98,10 @@ flatpak_base_image = {{ default.flatpak_base_image }}
reactor_config_map = {{ default.reactor_config_map }} reactor_config_map = {{ default.reactor_config_map }}
{% endif %} {% endif %}
{% if default.build_from is defined %}
build_from = {{ default.build_from }}
{% endif %}
[scratch] [scratch]
scratch = true scratch = true
{% if default.username is defined %} {% if default.username is defined %}
@ -188,3 +192,7 @@ flatpak_base_image = {{ default.flatpak_base_image }}
{% if default.reactor_config_map_scratch is defined %} {% if default.reactor_config_map_scratch is defined %}
reactor_config_map = {{ default.reactor_config_map_scratch }} reactor_config_map = {{ default.reactor_config_map_scratch }}
{% endif %} {% endif %}
{% if default.build_from is defined %}
build_from = {{ default.build_from }}
{% endif %}