diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index 524067fc40..534cca1dd2 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -543,8 +543,9 @@ critpath.jsonpath = /etc/bodhi/critpath # files. This is used if critpath.type is not defined. # critpath_pkgs = -# The net karma required to submit a critial path update to a pending release. -min_karma = 2 +# The net karma required to submit updates to a pending release. +min_karma = 1 +critpath.min_karma = 2 # Allow critpath to submit for stable after 2 weeks with no negative karma critpath.mandatory_days_in_testing = 14 @@ -574,16 +575,19 @@ fedora_modular.mandatory_days_in_testing = 7 f{{ FedoraBranchedNumber }}.status = pre_beta f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 0 f{{ FedoraBranchedNumber }}.pre_beta.min_karma = 0 +f{{ FedoraBranchedNumber }}.pre_beta.critpath.min_karma = 0 f{{ FedoraBranchedNumber }}.pre_beta.critpath.mandatory_days_in_testing = 0 {% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'prebeta' %} f{{ FedoraBranchedNumber }}.status = pre_beta f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 3 f{{ FedoraBranchedNumber }}.pre_beta.min_karma = 1 +f{{ FedoraBranchedNumber }}.pre_beta.critpath.min_karma = 1 f{{ FedoraBranchedNumber }}.pre_beta.critpath.mandatory_days_in_testing = 3 {% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'postbeta' %} f{{ FedoraBranchedNumber }}.status = post_beta f{{ FedoraBranchedNumber }}.post_beta.mandatory_days_in_testing = 7 -f{{ FedoraBranchedNumber }}.post_beta.min_karma = 2 +f{{ FedoraBranchedNumber }}.post_beta.min_karma = 1 +f{{ FedoraBranchedNumber }}.post_beta.critpath.min_karma = 2 f{{ FedoraBranchedNumber }}.post_beta.critpath.mandatory_days_in_testing = 14 {% endif %} @@ -595,6 +599,7 @@ f{{ FedoraRawhideNumber }}c.pre_beta.mandatory_days_in_testing = 0 f{{ FedoraRawhideNumber }}.status = pre_beta f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0 f{{ FedoraRawhideNumber }}.pre_beta.min_karma = 0 +f{{ FedoraRawhideNumber }}.pre_beta.critpath.min_karma = 0 f{{ FedoraRawhideNumber }}.pre_beta.critpath.mandatory_days_in_testing = 0 # ELN gating - Updates in ELN don't require any days in testing. diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 3022856e26..8d949361fc 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base +++ b/roles/openshift-apps/bodhi/templates/dockerfile-base @@ -1,7 +1,7 @@ {% if env == "staging" %} FROM fedora:41 {% else %} -FROM fedora:40 +FROM fedora:41 {% endif %} LABEL \ name="bodhi-base" \ diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron b/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron index 3625abe3b5..4a2136581f 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron +++ b/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron @@ -1,7 +1,7 @@ {% if env == "staging" %} FROM fedora:41 {% else %} -FROM fedora:40 +FROM fedora:41 {% endif %} LABEL \ name="bodhi-critpathcron" \ diff --git a/vars/apps/bodhi.yml b/vars/apps/bodhi.yml index afb4262f4c..ca60a42b1f 100644 --- a/vars/apps/bodhi.yml +++ b/vars/apps/bodhi.yml @@ -1,5 +1,5 @@ --- # Set the Bodhi variables -bodhi_version: "{{ (env == 'production')|ternary('8.2.0', '8.2.0') }}" +bodhi_version: "{{ (env == 'production')|ternary('8.3.0', '8.3.0') }}" bodhi_openshift_pods: 1 bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*