diff --git a/roles/install_yamls/tasks/main.yml b/roles/install_yamls/tasks/main.yml index fc90ce7a2d..3c8ceb83da 100644 --- a/roles/install_yamls/tasks/main.yml +++ b/roles/install_yamls/tasks/main.yml @@ -50,7 +50,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) }}