From cd6cbe632ece739a85391288c0a8159de30d38a6 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Oct 03 2023 17:21:22 +0000 Subject: bodhi: move to version 7.2.2 Signed-off-by: Kevin Fenzi --- diff --git a/inventory/group_vars/os_control b/inventory/group_vars/os_control index b725710..da402b2 100644 --- a/inventory/group_vars/os_control +++ b/inventory/group_vars/os_control @@ -1,4 +1,4 @@ --- # Set the Bodhi variables -bodhi_version: "7.2.1" +bodhi_version: "7.2.2" bodhi_openshift_pods: 1 diff --git a/inventory/group_vars/os_control_stg b/inventory/group_vars/os_control_stg index b725710..da402b2 100644 --- a/inventory/group_vars/os_control_stg +++ b/inventory/group_vars/os_control_stg @@ -1,4 +1,4 @@ --- # Set the Bodhi variables -bodhi_version: "7.2.1" +bodhi_version: "7.2.2" bodhi_openshift_pods: 1 diff --git a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org index 5ced139..2ac669a 100644 --- a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org @@ -73,7 +73,7 @@ fedmsg_certs: group: ftpsync owner: root service: ftpsync -ks_repo: http://10.3.163.35/pub/fedora/linux/releases/37/Server/x86_64/os/ +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/38/Server/x86_64/os/ ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora max_mem_size: 98304 mem_size: 98304 diff --git a/roles/openshift-apps/bodhi/templates/dockerfile-base b/roles/openshift-apps/bodhi/templates/dockerfile-base index 8ed99e5..37f4f36 100644 --- a/roles/openshift-apps/bodhi/templates/dockerfile-base +++ b/roles/openshift-apps/bodhi/templates/dockerfile-base @@ -19,9 +19,6 @@ RUN dnf install -y bodhi-server python3-pyramid_sawing python3-gunicorn sed --re RUN dnf install -y bodhi-server-{{bodhi_version}} python3-pyramid_sawing python3-gunicorn sed {% endif %} -# HOTFIX for https://github.com/fedora-infra/bodhi/pull/4687 -RUN sed -i -e 's|verbose=False|verbose=True|' /usr/lib/python3*/site-packages/bodhi/server/models.py - # link the static files for a simpler httpd.conf RUN ln -s $(python3 -Ic "import sysconfig; print(sysconfig.get_path('purelib', 'rpm_prefix'))")/bodhi/server/static/ /srv/bodhi-static