From 460924b0a1725ed7a5f849ad9bb08f5b21203564 Mon Sep 17 00:00:00 2001
From: Amartya Sinha <amsinha@redhat.com>
Date: Tue, 16 Dec 2025 17:19:28 +0530
Subject: [PATCH] [set_openstack_containers] Add fallback task for operators
 not having generic k8s labels

Some of the operators with older build did not have the generic app.kubernetes.io/name label, thus they need to be identified using openstack.org/operator-name label.

Signed-off-by: Amartya Sinha <amsinha@redhat.com>
---
 roles/set_openstack_containers/tasks/main.yml | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/roles/set_openstack_containers/tasks/main.yml b/roles/set_openstack_containers/tasks/main.yml
index 067f52ecbc..576a5f9f0f 100644
--- a/roles/set_openstack_containers/tasks/main.yml
+++ b/roles/set_openstack_containers/tasks/main.yml
@@ -52,13 +52,24 @@
     cacheable: true
 
 - name: Get meta operator environment variable
-  environment:
-    KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
-    PATH: "{{ cifmw_path }}"
-  cifmw.general.ci_script:
-    output_dir: "{{ cifmw_set_openstack_containers_basedir }}/artifacts"
-    script: "oc set env $(oc get pods -n {{ operator_namespace }} -o name -l app.kubernetes.io/name={{ operator_name }}-operator) -n {{ operator_namespace }} --list"
-  register: containers_env_list
+  block:
+    - name: Get meta operator environment variable with generic k8s labels
+      environment:
+        KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+        PATH: "{{ cifmw_path }}"
+      cifmw.general.ci_script:
+        output_dir: "{{ cifmw_set_openstack_containers_basedir }}/artifacts"
+        script: "oc set env $(oc get pods -n {{ operator_namespace }} -o name -l app.kubernetes.io/name={{ operator_name }}-operator) -n {{ operator_namespace }} --list"
+      register: containers_env_list
+  rescue:
+    - name: Get meta operator environment variable (for operators not having generic k8s labels)
+      environment:
+        KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
+        PATH: "{{ cifmw_path }}"
+      cifmw.general.ci_script:
+        output_dir: "{{ cifmw_set_openstack_containers_basedir }}/artifacts"
+        script: "oc set env $(oc get pods -n {{ operator_namespace }} -o name -l openstack.org/operator-name={{ operator_name }}) -n {{ operator_namespace }} --list"
+      register: containers_env_list
 
 - name: Generate update_env_vars.sh script
   ansible.builtin.template: