Integrate set_openstack_containers with deplo_architecture and use sk…

…ip-tags in reproducer

set_openstack_containers role is used to update openstack container images
using openstack version cr in update jobs. Let's use the same to
update the containers in va.
It will be used in downstream VA jobs to use RHEL openstack
services container.
To run correct role for update/deployment job add skip-tags to reproducer script.

playbooks/06-deploy-architecture.yml

@@ -197,6 +197,15 @@
         - update_containers
         - edpm_bootstrap
 
+    - name: Update containers in deployed OSP operators using set_openstack_containers role
+      vars:
+        cifmw_set_openstack_containers_extra_vars: "{{ cifmw_edpm_prepare_extra_vars }}"
+      ansible.builtin.include_role:
+        name: set_openstack_containers
+      tags:
+        - set_openstack_containers
+        - edpm_bootstrap
+
     - name: Configure LVMS Storage Class
       ansible.builtin.include_role:
         name: ci_lvms_storage

roles/reproducer/README.md

@@ -10,6 +10,7 @@ None
 * `cifmw_reproducer_compute_repos`: (List[mapping]) List of yum repository that must be deployed on the compute nodes during their creation. Defaults to `[]`.
 * `cifmw_reproducer_compute_set_repositories`: (Bool) Deploy repositories (rhos-release) on Compute nodes. Defaults to `true`.
 * `cifmw_reproducer_play_extravars`: (List[string]) List of extra-vars you want to pass down to the EDPM deployment playbooks. Defaults to `[]`.
+* `cifmw_reproducer_play_skip_tags`: (List[string]) List of skip-tags you want to pass down to the EDPM deployment playbooks. Defaults to `[]`.
 * `cifmw_reproducer_kubecfg`: (String) Path to the CRC kubeconfig file. Defaults to the image_local_dir defined in the cifmw_libvirt_manager_configuration dict.
 * `cifmw_reproducer_repositories`: (List[mapping]) List of repositories you want to synchronize from your local machine to the ansible controller.
 * `cifmw_reproducer_run_job`: (Bool) Run actual CI job. Defaults to `true`.

roles/reproducer/defaults/main.yml

@@ -32,6 +32,7 @@ cifmw_reproducer_compute_repos: []
 cifmw_reproducer_compute_set_repositories: true
 cifmw_reproducer_repositories_path: "src"
 cifmw_reproducer_play_extravars: []
+cifmw_reproducer_play_skip_tags: []
 cifmw_reproducer_provision_net: ocppr
 cifmw_reproducer_supported_hypervisor_os:
   CentOS:

roles/reproducer/templates/script.sh.j2

@@ -12,5 +12,8 @@ ansible-playbook -i ~/ci-framework-data/artifacts/zuul_inventory.yml \
 {% for extravar in extravars %}
   -e {{ extravar }} \
 {% endfor %}
+{% if cifmw_reproducer_play_skip_tags | length > 0 -%}
+  --skip-tags ' + (cifmw_reproducer_play_skip_tags | join(',')) \
+{% endif -%}
   {{ playbook }} --flush-cache $@
 popd