Move cifmw_basedir var to group_vars - part four

group_vars/all.yml

@@ -8,3 +8,4 @@ cifmw_project_dir_absolute: "{{ ansible_user_dir }}/{{ cifmw_project_dir }}"
 cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/install_yamls
 # since cifmw_installyamls_repos var already exists, let's use that and move all definition here in single place instead of creating another variable.
 cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
+cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"

hooks/playbooks/group_vars

@@ -0,0 +1 @@
+../../group_vars

roles/reportportal/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 cifmw_reportportal_dry_run: false
-cifmw_reportportal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_reportportal_basedir: "{{ cifmw_basedir }}"
 cifmw_reportportal_datarouter_url: ""
 cifmw_reportportal_datarouter_username: ""
 cifmw_reportportal_datarouter_password: ""

roles/reproducer/defaults/main.yml

@@ -20,7 +20,7 @@
 cifmw_reproducer_controller_user: "{{ hostvars['controller-0']['ansible_ssh_user'] | default('zuul') }}"
 cifmw_reproducer_controller_user_dir: "/home/{{ cifmw_reproducer_controller_user }}"
 cifmw_reproducer_controller_basedir: "{{ cifmw_reproducer_controller_user_dir }}/ci-framework-data"
-cifmw_reproducer_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_reproducer_basedir: "{{ cifmw_basedir }}"
 cifmw_reproducer_src_dir: "{{ cifmw_ci_src_dir | default( ansible_user_dir ~ '/src') }}"
 cifmw_reproducer_kubecfg: "{{ cifmw_libvirt_manager_configuration.vms.crc.image_local_dir }}/kubeconfig"
 cifmw_reproducer_params: {}

roles/rhol_crc/defaults/main.yml

@@ -39,8 +39,7 @@ cifmw_rhol_crc_base_url: >-
 # In case we don't use cifmw_basedir it will get the
 # base_dir of the project if .git exists - change dir
 # does not affect other tasks:
-cifmw_rhol_crc_basedir: >-
-  {{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}
+cifmw_rhol_crc_basedir: "{{ cifmw_basedir }}"
 cifmw_rhol_crc_binary_folder: "{{ ansible_user_dir }}/bin"
 cifmw_rhol_crc_binary: "{{ cifmw_rhol_crc_binary_folder }}/crc"
 cifmw_rhol_crc_force_cleanup: false

roles/run_hook/tasks/playbook.yml

@@ -12,8 +12,7 @@
       {%- else -%}
       {{ hook.source }}
       {%- endif -%}
-    _bdir: >-
-      {{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}
+    _bdir: "{{ cifmw_basedir }}"
     _operator_namespace: >-
       {{
         cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] |

roles/set_openstack_containers/defaults/main.yml

@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_set_openstack_containers"
-cifmw_set_openstack_containers_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_set_openstack_containers_basedir: "{{ cifmw_basedir }}"
 cifmw_set_openstack_containers_registry: quay.io
 cifmw_set_openstack_containers_namespace: podified-antelope-centos9
 cifmw_set_openstack_containers_tag: current-podified

roles/shiftstack/defaults/main.yml

@@ -19,7 +19,7 @@
 # All variables within this role should have a prefix of "cifmw_shiftstack"
 cifmw_shiftstack_ansible_command_logs_dir: "{{ cifmw_shiftstack_basedir }}/ansible_command_logs"
 cifmw_shiftstack_artifacts_dir: "{{ cifmw_shiftstack_basedir }}/artifacts"
-cifmw_shiftstack_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/shiftstack"
+cifmw_shiftstack_basedir: "{{ cifmw_basedir }}/tests/shiftstack"
 cifmw_shiftstack_client_incluster_secret_manifest: "{{ cifmw_shiftstack_client_pod_name }}_incluster_secret.yml"
 cifmw_shiftstack_client_incluster_secret_name: "incluster-kubeconfig"
 cifmw_shiftstack_client_pod_image: "quay.io/shiftstack-qe/shiftstack-client:latest"

roles/sushy_emulator/defaults/main.yml

@@ -18,8 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_sushy_emulator"
 
-cifmw_sushy_emulator_basedir: >-
-  {{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}
+cifmw_sushy_emulator_basedir: "{{ cifmw_basedir }}"
 cifmw_sushy_emulator_container_name: "cifmw-sushy_emulator"
 cifmw_sushy_emulator_driver: libvirt
 cifmw_sushy_emulator_driver_openstack_client_config_file: /etc/openstack/clouds.yaml

roles/tempest/defaults/main.yml

@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_tempest"
-cifmw_tempest_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/tempest"
+cifmw_tempest_artifacts_basedir: "{{ cifmw_basedir }}/tests/tempest"
 cifmw_tempest_default_groups:
   - default
 cifmw_tempest_default_jobs:

roles/tempest/molecule/default/prepare.yml

@@ -19,7 +19,6 @@
   hosts: all
   vars:
     ansible_user_dir: "{{ lookup('env', 'HOME') }}"
-    cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack

roles/test_operator/defaults/main.yml

@@ -23,7 +23,7 @@ cifmw_test_operator_stages:
   - name: tempest
     type: tempest
 cifmw_test_operator_fail_on_test_failure: true
-cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator"
+cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator"
 cifmw_test_operator_namespace: openstack
 cifmw_test_operator_controller_namespace: openstack-operators
 cifmw_test_operator_bundle: ""
@@ -42,7 +42,7 @@ cifmw_test_operator_storage_class: "{{ cifmw_test_operator_storage_class_prefix
 cifmw_test_operator_delete_logs_pod: false
 cifmw_test_operator_privileged: true
 cifmw_test_operator_selinux_level: "s0:c478,c978"
-cifmw_test_operator_crs_path: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/test-operator-crs"
+cifmw_test_operator_crs_path: "{{ cifmw_basedir }}/artifacts/test-operator-crs"
 cifmw_test_operator_log_pod_definition:
   apiVersion: v1
   kind: Pod

roles/update/tasks/update_variant_split.yml

@@ -22,7 +22,7 @@
 
 - name: Run tests after Services update
   vars:
-    cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator_update"
+    cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator_update"
     cifmw_test_operator_tempest_name: "post-services-update-tempest-tests"
   ansible.builtin.include_role:
     name: cifmw_setup

roles/update_containers/defaults/main.yml

@@ -20,10 +20,7 @@
 
 cifmw_update_containers: false
 cifmw_update_containers_namespace: openstack
-cifmw_update_containers_base_dir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_update_containers_base_dir: "{{ cifmw_basedir }}"
 cifmw_update_containers_dest_path: >-
   {{
     [

roles/validations/defaults/main.yml

@@ -40,7 +40,7 @@ cifmw_validations_default_path: "{{ role_path }}/tasks"
 cifmw_validations_edpm_check_node: compute-0
 cifmw_validations_edpm_second_check_node: compute-1
 
-cifmw_validations_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_validations_basedir: "{{ cifmw_basedir }}"
 
 cifmw_validations_namespace: "openstack"
 

scenarios/centos-9/base.yml

@@ -2,4 +2,3 @@
 # Configure base system to match centos
 cifmw_repo_setup_os_release: 'centos'
 cifmw_repo_setup_dist_major_version: 9
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"

scenarios/centos-9/kuttl.yml

@@ -1,6 +1,6 @@
 ---
 cifmw_install_yamls_vars:
   BMO_SETUP: false
-cifmw_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_artifacts_basedir: "{{ cifmw_basedir }}"
 
 cifmw_openshift_setup_skip_internal_registry: true

scenarios/reproducers/3-nodes.yml

@@ -3,7 +3,6 @@
 # We can't use ansible_user_dir here, unless you have the same user on the
 # hypervisor and locally.
 # This will be created on the hypervisor.
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
 
 cifmw_rhol_crc_config:

scenarios/reproducers/va-common.yml

@@ -10,7 +10,6 @@
 
 
 # Ensure some basic directories and parameter are set
-cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
 cifmw_path: "{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
 
 # Ensure our vbmcd isn't conflicting with devscripts managed instance

update-edpm.yml

@@ -26,7 +26,7 @@
   tasks:
     - name: Run Test
       vars:
-        cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/tests/test_operator_update"
+        cifmw_test_operator_artifacts_basedir: "{{ cifmw_basedir }}/tests/test_operator_update"
         cifmw_test_operator_tempest_name: "post-update-tempest-tests"
       ansible.builtin.import_role:
         name: cifmw_setup