From 796d3adcd65b98df985ca66f3397028b2722569e Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Wed, 12 Feb 2025 17:17:22 +0530 Subject: [PATCH] Filter out rhos branches when setting openstack_k8s_branch In order to run jobs against rhos branches have to filter those branches and fallback to main. Related-Issue: OSPRH-10539 --- roles/install_yamls/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/install_yamls/tasks/main.yml b/roles/install_yamls/tasks/main.yml index 4d87716b74..0f3ed9536b 100644 --- a/roles/install_yamls/tasks/main.yml +++ b/roles/install_yamls/tasks/main.yml @@ -71,7 +71,7 @@ 'OUT': cifmw_install_yamls_manifests_dir, 'OUTPUT_DIR': cifmw_install_yamls_edpm_dir, 'CHECKOUT_FROM_OPENSTACK_REF': cifmw_install_yamls_checkout_openstack_ref, - 'OPENSTACK_K8S_BRANCH': (zuul is defined and zuul.branch != 'master') | ternary(zuul.branch, 'main') + 'OPENSTACK_K8S_BRANCH': (zuul is defined and not zuul.branch |regex_search('master|rhos')) | ternary(zuul.branch, 'main') }) | combine(install_yamls_operators_repos) }}