From 49dabbf15cad3e35448890b1cd45237f5aca373f Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria@redhat.com>
Date: Wed, 3 Jul 2024 10:20:59 +0200
Subject: [PATCH] Honor the stf_channel variable

Nightly bundles use the "unstable" channel while
RH catalog bundles use "stable-1.5" channel

We should use nightly bundles "unstable" by default
and pass "stable-1.5" when deploying from RH catalog
---
 build/stf-run-ci/tasks/create_catalog.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/build/stf-run-ci/tasks/create_catalog.yml b/build/stf-run-ci/tasks/create_catalog.yml
index 1e712a7f..82bab4b0 100644
--- a/build/stf-run-ci/tasks/create_catalog.yml
+++ b/build/stf-run-ci/tasks/create_catalog.yml
@@ -15,20 +15,15 @@
 
 - name: Create info variables from provided pre-built bundles (deploy from bundles)
   when: __deploy_from_bundles_enabled | bool
-  block:
-    - name: Define channel for pre-built bundles
-      ansible.builtin.set_fact:
-        stf_channel: stable-1.5
-    - name: Set info variables from provided pre-built bundles
-      ansible.builtin.set_fact:
-        sto_bundle_info:
-          'bundle_default_channel': "{{ stf_channel }}"
-          'bundle_channels': "{{ stf_channel }}"
-          'operator_bundle_version': "{{ sto_bundle_image_tag }}"
-        sgo_bundle_info:
-          'bundle_default_channel': "{{ stf_channel }}"
-          'bundle_channels': "{{ stf_channel }}"
-          'operator_bundle_version': "{{ sgo_bundle_image_tag }}"
+  ansible.builtin.set_fact:
+    sto_bundle_info:
+      'bundle_default_channel': "{{ stf_channel }}"
+      'bundle_channels': "{{ stf_channel }}"
+      'operator_bundle_version': "{{ sto_bundle_image_tag }}"
+    sgo_bundle_info:
+      'bundle_default_channel': "{{ stf_channel }}"
+      'bundle_channels': "{{ stf_channel }}"
+      'operator_bundle_version': "{{ sgo_bundle_image_tag }}"
 
 - name: Show STO and SGO bundle info that will used in the index image
   ansible.builtin.debug: