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

image-builder: enable osbuild plugin on koji staging builders

Browse source
This commit is contained in:
David Kirwan 2022-03-24 10:12:26 +00:00
parent 628dbdeef7
commit aeb695f2bc
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/koji_builder/templates/builder.conf.staging
View file

@ -2,8 +2,8 @@
server = https://api.stage.openshift.com/ server = https://api.stage.openshift.com/
[composer:oauth] [composer:oauth]
client_id = "{{koji_builder_client_id_stg}}" client_id = {{koji_builder_client_id_stg}}
client_secret = "{{koji_builder_client_secret_stg}}" client_secret = {{koji_builder_client_secret_stg}}
token_url = https://identity.api.openshift.com/auth/realms/rhoas/protocol/openid-connect/token token_url = https://identity.api.openshift.com/auth/realms/rhoas/protocol/openid-connect/token
[koji] [koji]

7
roles/koji_builder/templates/kojid.conf
View file

@ -21,14 +21,14 @@ rpmbuild_timeout=201600
use_createrepo_c=True use_createrepo_c=True
{% if env != 'staging' %} {% if env != 'staging' %}
; The default time to clean up a failed buildroot is 4 hours. ; The default time to clean up a failed buildroot is 4 hours.
; We find that it's sometimes helpfull to have it available the next day ; We find that it's sometimes helpfull to have it available the next day
; especially for hard to reproduce jobs that run as part of the composes. ; especially for hard to reproduce jobs that run as part of the composes.
; So, up this to 24 hours so we have time to look at failures. ; So, up this to 24 hours so we have time to look at failures.
failed_buildroot_lifetime=86400 failed_buildroot_lifetime=86400
{% else %} {% else %}
; The default time to clean up a failed buildroot is 4 hours. ; The default time to clean up a failed buildroot is 4 hours.
; In staging we keep that because we only have single builders and ; In staging we keep that because we only have single builders and
; Their disk will fill up if we try and keep all builds for 24 hours ; Their disk will fill up if we try and keep all builds for 24 hours
failed_buildroot_lifetime=14400 failed_buildroot_lifetime=14400
{% endif %} {% endif %}
@ -154,6 +154,7 @@ keytab = /etc/kojid/kojid.keytab
{% endif %} {% endif %}
{{ plugins.append("rpmautospec_builder") }} {{ plugins.append("rpmautospec_builder") }}
{{ plugins.append("osbuild") }}
; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled
plugins = {{ plugins | join(" ") }} plugins = {{ plugins | join(" ") }}