From aeb695f2bc525e60a5658de8d88086f96219585c Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Thu, 24 Mar 2022 10:12:26 +0000 Subject: [PATCH] image-builder: enable osbuild plugin on koji staging builders --- roles/koji_builder/templates/builder.conf.staging | 4 ++-- roles/koji_builder/templates/kojid.conf | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/roles/koji_builder/templates/builder.conf.staging b/roles/koji_builder/templates/builder.conf.staging index b20dfd1846..d33ee8a07d 100644 --- a/roles/koji_builder/templates/builder.conf.staging +++ b/roles/koji_builder/templates/builder.conf.staging @@ -2,8 +2,8 @@ server = https://api.stage.openshift.com/ [composer:oauth] -client_id = "{{koji_builder_client_id_stg}}" -client_secret = "{{koji_builder_client_secret_stg}}" +client_id = {{koji_builder_client_id_stg}} +client_secret = {{koji_builder_client_secret_stg}} token_url = https://identity.api.openshift.com/auth/realms/rhoas/protocol/openid-connect/token [koji] diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 3a3082066f..0ae1c3cbd1 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -21,14 +21,14 @@ rpmbuild_timeout=201600 use_createrepo_c=True {% 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 ; 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. failed_buildroot_lifetime=86400 {% else %} -; The default time to clean up a failed buildroot is 4 hours. -; In staging we keep that because we only have single builders and +; The default time to clean up a failed buildroot is 4 hours. +; 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 failed_buildroot_lifetime=14400 {% endif %} @@ -154,6 +154,7 @@ keytab = /etc/kojid/kojid.keytab {% endif %} {{ plugins.append("rpmautospec_builder") }} +{{ plugins.append("osbuild") }} ; Config for the runroot plugin lives in /etc/kojid/runroot.conf, if enabled plugins = {{ plugins | join(" ") }}