Set proper value for cifmw_update_containers_registry/tag

Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>

Author: raukadah

.zuul.yaml

@@ -237,8 +237,6 @@
       cifmw_update_containers_watcher: true
       watcher_services_tag: watcher_latest
       watcher_registry_url: "{{ content_provider_os_registry_url }}"
-      cifmw_update_containers_tag: current-tested
-      cifmw_update_containers_registry: quay.rdoproject.org
       cifmw_test_operator_tempest_image_tag: watcher_latest
 
     extra-vars:

ci/scenarios/edpm.yml

@@ -88,3 +88,23 @@ cifmw_install_yamls_whitelisted_vars:
   - 'WATCHER_REPO'
   - 'WATCHER_BRANCH'
   - 'OUTPUT_DIR'
+
+cifmw_update_containers_registry: >-
+  {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' and cifmw_repo_setup_release == 'master' -%}
+  {{ content_provider_os_registry_url | split('/') | first }}
+  {%- elif content_provider_os_registry_url is defined and content_provider_os_registry_url == 'null' and cifmw_repo_setup_release == 'master' -%}
+  quay.rdoproject.org
+  {%- elif watcher_registry_url is defined -%}
+  {{ watcher_registry_url | split('/') | first }}
+  {%- else -%}
+  quay.io
+  {%- endif -%}
+
+cifmw_update_containers_tag: >-
+  {%- if content_provider_os_registry_url is defined and content_provider_os_registry_url != 'null' -%}
+  watcher_latest
+  {%- elif content_provider_os_registry_url is defined and content_provider_os_registry_url == 'null' and cifmw_repo_setup_release == 'master' -%}
+  current-tested
+  {%- else -%}
+  current-podified
+  {%- endif -%}