From 617e9c6cd080342dc4e487d401800f536c8e0a06 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 27 Nov 2024 17:27:41 -0800 Subject: [PATCH] greenwave: one more fiddle before I give up and revert Signed-off-by: Adam Williamson --- .../greenwave/templates/fedora.yaml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/roles/openshift-apps/greenwave/templates/fedora.yaml b/roles/openshift-apps/greenwave/templates/fedora.yaml index 60820cfd04..663edca1db 100644 --- a/roles/openshift-apps/greenwave/templates/fedora.yaml +++ b/roles/openshift-apps/greenwave/templates/fedora.yaml @@ -1,23 +1,21 @@ -#jinja2: trim_blocks:False - # rawhide and branched are controllable so we can flip them on and off # around branching manually if we need to, if we have issues with # failing tests {% macro product_versions(upgrade='false', rawhide='true', branched='true') -%} product_versions: -{% if rawhide|bool -%} +{% if rawhide|bool %} - fedora-{{ FedoraRawhideNumber }}{{''}} -{%- endif %} -{% if FedoraBranched and branched|bool -%} +{% endif %} +{% if FedoraBranched and branched|bool %} - fedora-{{ FedoraBranchedNumber }}{{''}} -{%- endif %} +{% endif %} - fedora-{{ FedoraCycleNumber }} -{% if FedoraPreviousPrevious or not upgrade|bool -%} +{% if FedoraPreviousPrevious or not upgrade|bool %} - fedora-{{ FedoraPreviousCycleNumber }}{{''}} -{%- endif %} -{% if FedoraPreviousPrevious and not upgrade|bool -%} +{% endif %} +{% if FedoraPreviousPrevious and not upgrade|bool %} - fedora-{{ FedoraPreviousPreviousCycleNumber }}{{''}} -{%- endif %} +{% endif %} {% endmacro -%}