From 4f9e62bc3acb82a25a8a7599dd2cc035079329ec Mon Sep 17 00:00:00 2001
From: Mattia Verga <mattia.verga@tiscali.it>
Date: Tue, 9 Apr 2024 15:19:24 +0200
Subject: [PATCH] bodhi: update to 8.1

Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
---
 roles/bodhi2/base/templates/production.ini.j2                | 3 +++
 roles/openshift-apps/bodhi/templates/dockerfile-base         | 2 +-
 roles/openshift-apps/bodhi/templates/dockerfile-critpathcron | 2 +-
 vars/apps/bodhi.yml                                          | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 80c2c6b4a7..3b0125f263 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -391,6 +391,8 @@ dogpile.cache.expiration_time = 21600
 # buildsystem = dev
 buildsystem = koji
 
+trusted_build_sources = git+https://src.fedoraproject.org/,https://src.fedoraproject.org/
+
 # The base URL to Koji, used to construct HTML links to Koji builds in the web UI
 # koji_web_url = https://koji.fedoraproject.org/koji/
 {% if env == 'staging' %}
@@ -765,6 +767,7 @@ sqlalchemy.url = postgresql://bodhi2:{{ bodhi2Password }}@db-bodhi.iad2.fedorapr
 {% elif env == 'staging' %}
 sqlalchemy.url = postgresql://bodhi2:{{ bodhi2PasswordSTG }}@db01.stg.iad2.fedoraproject.org/bodhi2
 {% endif %}
+# sqlalchemy_extra.statement_timeout = 30000
 
 ##
 ## Templates
diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base
index 6d0ae40443..c56498723b 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:40
 {% else %}
-FROM fedora:38
+FROM fedora:40
 {% endif %}
 LABEL \
     name="bodhi-base" \
diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron b/roles/openshift-apps/bodhi/templates/dockerfile-critpathcron
index e3a7fcc348..8d1a365b44 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:40
 {% else %}
-FROM fedora:38
+FROM fedora:40
 {% endif %}
 LABEL \
     name="bodhi-critpathcron" \
diff --git a/vars/apps/bodhi.yml b/vars/apps/bodhi.yml
index a00ed64b37..e853f5807d 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.0.2', '8.0.2') }}"
+bodhi_version: "{{ (env == 'production')|ternary('8.1.0', '8.1.0') }}"
 bodhi_openshift_pods: 1
 bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*