From f103b2a7288ea5edf795fab5d2ae4c7d537c6c7a Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 17 May 2025 10:52:39 -0700 Subject: [PATCH] Revert "bodhi: leave prod alone for now" This reverts commit 5243c435beebb81a0099dcaee80f7f39392297d5. Lets try and move production over. --- inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org | 2 +- roles/openshift-apps/bodhi/templates/dockerfile-base | 2 +- vars/apps/bodhi.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org index 37f7249e92..f32f9490eb 100644 --- a/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org +++ b/inventory/host_vars/bodhi-backend01.iad2.fedoraproject.org @@ -6,7 +6,7 @@ bodhi_updates_handler_enabled: False datacenter: iad2 eth0_ipv4_gw: 10.3.169.254 eth0_ipv4_ip: 10.3.169.101 -ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/41/Server/x86_64/os/ +ks_repo: https://infrastructure.fedoraproject.org/pub/fedora/linux/releases/42/Server/x86_64/os/ ks_url: https://infrastructure.fedoraproject.org/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 f18cc4554a..c9bd27adcf 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:42 {% else %} -FROM fedora:40 +FROM fedora:42 {% endif %} LABEL \ name="bodhi-base" \ diff --git a/vars/apps/bodhi.yml b/vars/apps/bodhi.yml index 183288c799..13d0bb65e4 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.3.0', '25.5.0') }}" +bodhi_version: "{{ (env == 'production')|ternary('25.5.0', '25.5.0') }}" bodhi_openshift_pods: 1 bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*