From c386f0b0c5a25139adf6f63ba10b249b405f626c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 5 Dec 2023 14:11:04 +0100 Subject: [PATCH] bodhi: update config file for v8 Signed-off-by: Mattia Verga --- roles/bodhi2/base/templates/production.ini.j2 | 65 +++++++++++-------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index e2a49399da..fe118d7457 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -99,10 +99,6 @@ query_wiki_test_cases = True wiki_url = https://{{env_prefix}}fedoraproject.org/w/api.php test_case_base_url = https://{{env_prefix}}fedoraproject.org/wiki/ -# URL of the resultsdb for integrating checks and stuff -resultsdb_api_url = https://resultdb{{env_suffix}}.fedoraproject.org/ -resultsdb_url = https://resultsdb{{env_suffix}}.fedoraproject.org/results/ - # Set this to True to enable gating based on policies enforced by Greenwave. If you set this to # True, be sure to have celery-beat enabled in one of the Celery workers. # test_gating.required = False @@ -358,7 +354,10 @@ admin_groups = proventesters security_respons bodhiadmin sysadmin-main bodhi_upd stats_blacklist = bodhi anonymous autoqa taskotron bpeck/jenkins-continuous-infra.apps.ci.centos.org packagerbot/os-master02.iad2.fedoraproject.org distrobuildsync-eln/jenkins-continuous-infra.apps.ci.centos.org # A list of non-person users -# system_users = bodhi autoqa taskotron +# system_users = bodhi + +# Groups allowed to globally waive or re-trigger CI tests +# qa_groups = fedora-ci-users # The max length for an update title before we truncate it in the web ui # max_update_length_for_ui = 30 @@ -374,12 +373,6 @@ top_testers_timeframe = 900 # release. # stacks_enabled = False -# These are the default requirements that we apply to stacks, packages, and -# updates. Users have free-reign to override them for each kind of entity. At -# the end of the day, we only consider the requirements defined by single -# updates themselves when gating in the backend masher process. -# site_requirements = dist.rpmdeplint dist.upgradepath - # Cache settings # dogpile.cache.backend = dogpile.cache.dbm # dogpile.cache.expiration_time = 100 @@ -389,7 +382,7 @@ dogpile.cache.backend = dogpile.cache.memory_pickle dogpile.cache.expiration_time = 21600 # Exclude sending emails to these users -# exclude_mail = autoqa taskotron +# exclude_mail = bodhi ## ## Buildsystem settings @@ -450,12 +443,6 @@ pagure_url = https://src{{env_suffix}}.fedoraproject.org/ # pagure_flatpak_namespace = modules pagure_flatpak_namespace = flatpaks -## -## Product Definition Center (PDC) -## -# pdc_url = https://pdc.fedoraproject.org/ -pdc_url = https://pdc{{env_suffix}}.fedoraproject.org/ - ## ## Bug tracker settings @@ -468,12 +455,22 @@ bugtracker = bugzilla # them are created. Positional substitution is used, and the three %%s's will be filled in with the # update title, the release's long name, and the URL to the update, respectively. # initial_bug_msg = %%s has been submitted as an update to %%s. %%s +# them are created. These placeholders are available: +# - {update_alias} +# - {update_beauty_title} +# - {update_release} +# - {update_url} +# initial_bug_msg = {update_alias} ({update_beauty_title}) has been submitted as an update to {update_release}.\n{update_url} # A template that Bodhi will use when commenting on Bugzilla tickets when Updates that reference -# them are marked stable. Positional substitution is used, and the first %%s will be filled in with -# the update title and the second will be filled in with the release's long name and the update -# status. -# stable_bug_msg = %%s has been pushed to the %%s repository. If problems still persist, please make note of it in this bug report. +# them are marked stable. These placeholders are available: +# - {update_title} +# - {update_beauty_title} +# - {update_alias} +# - {repo} +# - {install_instructions} +# - {update_url} +# stable_bug_msg = {update_alias} ({update_beauty_title}) has been pushed to the {repo} repository.\n. If problems still persists, please make note of it in this bug report. # The following two templates are used to comment on Bugzilla tickets. %%s will be substituted with # the update's URL. The first is used for all updates, unless the epel setting in defined, which @@ -538,17 +535,17 @@ reboot_pkgs = kernel kernel-smp kernel-PAE glibc hal dbus ## https://fedoraproject.org/wiki/Critical_path_package ## -# You can allow Bodhi to query for critpath packages from the Fedora Package -# Database by setting this value to `pkgdb` or the Product Definition -# Center by setting this value to `pdc`. If it isn't set, it'll just use the -# hardcoded list below. +# You can allow Bodhi to read critpath packages from JSON files (expected to +# be generated by the `critpath.py` script from the releng repo) by setting +# this value to `json`. If it isn't set, it'll just use the hardcoded list +# below. # critpath.type = critpath.type = json critpath.jsonpath = /etc/bodhi/critpath -# You can hardcode a list of critical path packages instead of using the PkgDB -# or PDC. This is used if critpath.type is not defined. +# You can hardcode a list of critical path packages instead of using JSON +# files. This is used if critpath.type is not defined. # critpath_pkgs = # The number of admin approvals it takes to be able to push a critical path @@ -613,6 +610,8 @@ f{{ FedoraRawhideNumber }}.pre_beta.critpath.stable_after_days_without_negative_ # ELN gating - Updates in ELN don't require any days in testing. eln.status = pre_beta eln.pre_beta.mandatory_days_in_testing = 0 + + ## ## Buildroot Override ## @@ -621,6 +620,16 @@ eln.pre_beta.mandatory_days_in_testing = 0 # buildroot_limit = 31 buildroot_overrides.expire_after = 1 +# You can have releases to extend its buildroot override tags from other releases. +# When submitting a Buildroot Override for that Release, the build will be tagged +# with the override_tag of its Release AND the override tags of the inherited releases. +# Left Release.name goes lowercase, right Release.names must be specified exactly. +# Below is an example, all EPEL-9 builds submitted as buildroot overrides will also +# be tagged as EPEL-9N and EPEL-8 overrides. +# epel-9.override-extend = EPEL-9N,EPEL-8 +epel-9.override-extend = EPEL-9N + + ## ## Groups ##