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

bodhi: update to 8.3.0 and F41 base image

Browse source 
Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
This commit is contained in:
Mattia Verga 2024-11-25 18:17:23 +01:00 • committed by kevin
parent 07764302ca
commit 5a9fffb0f4
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
roles/bodhi2/base/templates/production.ini.j2
View file

@ -543,8 +543,9 @@ critpath.jsonpath = /etc/bodhi/critpath
# files. This is used if critpath.type is not defined. # files. This is used if critpath.type is not defined.
# critpath_pkgs = # critpath_pkgs =
# The net karma required to submit a critial path update to a pending release. # The net karma required to submit updates to a pending release.
min_karma = 2 min_karma = 1
critpath.min_karma = 2
# Allow critpath to submit for stable after 2 weeks with no negative karma # Allow critpath to submit for stable after 2 weeks with no negative karma
critpath.mandatory_days_in_testing = 14 critpath.mandatory_days_in_testing = 14
@ -574,16 +575,19 @@ fedora_modular.mandatory_days_in_testing = 7
f{{ FedoraBranchedNumber }}.status = pre_beta f{{ FedoraBranchedNumber }}.status = pre_beta
f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 0 f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 0
f{{ FedoraBranchedNumber }}.pre_beta.min_karma = 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 f{{ FedoraBranchedNumber }}.pre_beta.critpath.mandatory_days_in_testing = 0
{% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'prebeta' %} {% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'prebeta' %}
f{{ FedoraBranchedNumber }}.status = pre_beta f{{ FedoraBranchedNumber }}.status = pre_beta
f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 3 f{{ FedoraBranchedNumber }}.pre_beta.mandatory_days_in_testing = 3
f{{ FedoraBranchedNumber }}.pre_beta.min_karma = 1 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 f{{ FedoraBranchedNumber }}.pre_beta.critpath.mandatory_days_in_testing = 3
{% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'postbeta' %} {% elif FedoraBranchedBodhi is defined and FedoraBranchedBodhi == 'postbeta' %}
f{{ FedoraBranchedNumber }}.status = post_beta f{{ FedoraBranchedNumber }}.status = post_beta
f{{ FedoraBranchedNumber }}.post_beta.mandatory_days_in_testing = 7 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 f{{ FedoraBranchedNumber }}.post_beta.critpath.mandatory_days_in_testing = 14
{% endif %} {% endif %}
@ -595,6 +599,7 @@ f{{ FedoraRawhideNumber }}c.pre_beta.mandatory_days_in_testing = 0
f{{ FedoraRawhideNumber }}.status = pre_beta f{{ FedoraRawhideNumber }}.status = pre_beta
f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0 f{{ FedoraRawhideNumber }}.pre_beta.mandatory_days_in_testing = 0
f{{ FedoraRawhideNumber }}.pre_beta.min_karma = 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 f{{ FedoraRawhideNumber }}.pre_beta.critpath.mandatory_days_in_testing = 0
# ELN gating - Updates in ELN don't require any days in testing. # ELN gating - Updates in ELN don't require any days in testing.

2
roles/openshift-apps/bodhi/templates/dockerfile-base
View file

@ -1,7 +1,7 @@
{% if env == "staging" %} {% if env == "staging" %}
FROM fedora:41 FROM fedora:41
{% else %} {% else %}
FROM fedora:40 FROM fedora:41
{% endif %} {% endif %}
LABEL \ LABEL \
name="bodhi-base" \ name="bodhi-base" \

2
roles/openshift-apps/bodhi/templates/dockerfile-critpathcron
View file

@ -1,7 +1,7 @@
{% if env == "staging" %} {% if env == "staging" %}
FROM fedora:41 FROM fedora:41
{% else %} {% else %}
FROM fedora:40 FROM fedora:41
{% endif %} {% endif %}
LABEL \ LABEL \
name="bodhi-critpathcron" \ name="bodhi-critpathcron" \

2
vars/apps/bodhi.yml
View file

@ -1,5 +1,5 @@
--- ---
# Set the Bodhi variables # 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_openshift_pods: 1
bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..* bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*