DNM: Move ansible_user_dir to group_vars

reproducer-clean.yml

@@ -72,7 +72,7 @@
         - deepscrub
       delegate_to: localhost
       ansible.builtin.file:
-        path: "{{ lookup('env', 'HOME') }}/ci-framework-data/ci-reproducer"
+        path: "{{ ansible_user_dir }}/ci-framework-data/ci-reproducer"
         state: absent
 
     - name: Remove basedir

roles/adoption_osp_deploy/molecule/default/converge.yml

@@ -12,7 +12,6 @@
     cifmw_adoption_osp_deploy_repos: []
     cifmw_adoption_source_scenario_path: "."
     cifmw_basedir: "{{ playbook_dir }}"
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 
   tasks:
     - name: Gather stack nodes and facts

roles/build_containers/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data/"
   roles:
     - role: test_deps

roles/build_containers/molecule/hotfix/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data/"
   roles:
     - role: test_deps

roles/build_openstack_packages/molecule/default/converge.yml

@@ -18,7 +18,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ cifmw_project_dir_absolute  }}"
     cifmw_bop_openstack_release: master
     cifmw_bop_dlrn_baseurl: https://trunk.rdoproject.org/centos9-master

roles/build_openstack_packages/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ cifmw_project_dir_absolute }}"
   roles:
     - role: test_deps

roles/cert_manager/tasks/validate_certs.yml

@@ -16,7 +16,7 @@
 
 - name: Create $HOME/bin dir
   ansible.builtin.file:
-    path: "{{ lookup('env', 'HOME') }}/bin"
+    path: "{{ ansible_user_dir }}/bin"
     state: directory
     mode: '0755'
 
@@ -30,11 +30,11 @@
     _arch: "{{ lookup('pipe', 'go env GOARCH') }}"
   ansible.builtin.get_url:
     url: "https://github.com/cert-manager/cmctl/releases/{{ cifmw_cert_manager_version }}/download/cmctl_{{ _os }}_{{ _arch }}"
-    dest: "{{ lookup('env', 'HOME') }}/bin/cmctl"
+    dest: "{{ ansible_user_dir }}/bin/cmctl"
     mode: "0755"
 
 - name: Verify cert_manager api
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
-  ansible.builtin.command: "{{ lookup('env', 'HOME') }}/bin/cmctl check api --wait=2m"
+  ansible.builtin.command: "{{ ansible_user_dir }}/bin/cmctl check api --wait=2m"

roles/ci_gen_kustomize_values/molecule/default/prepare.yml

@@ -20,7 +20,7 @@
   vars:
     cifmw_ci_gen_kustomize_values_src_dir: >-
       {{
-        (lookup('env', 'HOME'),
+        (ansible_user_dir,
          'ci-framework-data',
          'artifacts', 'ci_k8s_snippets') | path_join
       }}

roles/cifmw_setup/defaults/main.yml

@@ -1,3 +1,2 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 openstack_namespace: openstack

roles/compliance/molecule/default/converge.yml

@@ -18,15 +18,13 @@
 - name: Converge test of controller tasks
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_compliance_dry_run: true
   roles:
     - role: "compliance"
 
 - name: Converge test of compute tasks
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_compliance_dry_run: true
   roles:
     - role: "compliance"

roles/devscripts/molecule/default/prepare.yml

@@ -19,7 +19,6 @@
   hosts: all
 
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_use_libvirt: true
 

roles/edpm_build_images/molecule/default/converge.yml

@@ -18,7 +18,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_edpm_build_images_dry_run: true
     cifmw_edpm_build_images_via_rpm: false
   roles:

roles/edpm_deploy/molecule/default/converge.yml

@@ -18,7 +18,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_edpm_deploy_dryrun: true
   roles:
     - role: "edpm_deploy"

roles/edpm_deploy/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack

roles/edpm_deploy_baremetal/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   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"
   roles:

roles/edpm_prepare/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   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:

roles/hci_prepare/molecule/default/converge.yml

@@ -17,7 +17,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_path: "/path/to/bin"
     cifmw_openshift_kubeconfig: "path/to/kubeconfig"

roles/hive/molecule/default/converge.yml

@@ -18,7 +18,6 @@
   hosts: all
 
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_hive_artifacts_dir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_hive_kubeconfig: test_path

roles/hive/molecule/default/prepare.yml

@@ -19,7 +19,6 @@
   hosts: all
 
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
 
   roles:

roles/install_ca/molecule/default/converge.yml

@@ -17,8 +17,6 @@
 
 - name: Converge
   hosts: all
-  vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
   tasks:
     - name: Run role without any CA
       ansible.builtin.include_role:

roles/install_ca/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack
   roles:

roles/install_yamls/molecule/default/converge.yml

@@ -21,7 +21,6 @@
     cifmw_install_yamls_vars:
       namespace: foobar
       openstack_ctlplane: controlplane-yaml-file.yaml
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_repo: "{{ cifmw_installyamls_repos }}"
     zuul:
       branch: main

roles/libvirt_manager/defaults/main.yml

@@ -46,7 +46,7 @@ cifmw_libvirt_manager_configuration:
       memory: "{{ cifmw_libvirt_manager_compute_memory }}"
       cpus: "{{ cifmw_libvirt_manager_compute_cpus }}"
 
-cifmw_libvirt_manager_crc_pool: "{{ cifmw_crc_pool | default(lookup('env', 'HOME')) ~ '/.crc/machines/crc' }}"
+cifmw_libvirt_manager_crc_pool: "{{ cifmw_crc_pool | default(ansible_user_dir ~ '/.crc/machines/crc') }}"
 cifmw_libvirt_manager_vol_prefix: ''
 cifmw_libvirt_manager_pool:
 cifmw_libvirt_manager_pool_dir: "{{ cifmw_libvirt_manager_basedir }}/volumes"

roles/libvirt_manager/molecule/boot_order/converge.yml

@@ -20,7 +20,6 @@
   vars_files:
     - vars/net-def.yml
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     cifmw_libvirt_manager_configuration:
       vms:

roles/libvirt_manager/molecule/check_dns/converge.yml

@@ -18,7 +18,6 @@
   hosts: instance
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     _cifmw_libvirt_manager_layout:
       vms:

roles/libvirt_manager/molecule/deploy_layout/converge.yml

@@ -18,7 +18,6 @@
   hosts: instance
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     cifmw_libvirt_manager_vm_net_ip_set:
       compute: 100

roles/libvirt_manager/molecule/ocp_layout/converge.yml

@@ -19,7 +19,6 @@
   gather_facts: true
   vars:
     cifmw_run_id: aabbcc11
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     _cifmw_libvirt_manager_layout:
       vms:

roles/libvirt_manager/molecule/spine_leaf/converge.yml

@@ -18,7 +18,6 @@
   hosts: instance
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     cifmw_libvirt_manager_spineleaf_setup: true
     cifmw_libvirt_manager_network_interface_types:

roles/libvirt_manager/molecule/spine_leaf/verify.yml

@@ -3,7 +3,6 @@
   hosts: instance
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "/opt/basedir"
     compare_nets: >-
       {{

roles/libvirt_manager/tasks/clean_layout.yml

@@ -87,7 +87,7 @@
       vars:
         vm: "{{ item | replace('cifmw-', '') }}"
       ansible.builtin.blockinfile:
-        path: "{{ lookup('env', 'HOME') }}/.ssh/config"
+        path: "{{ ansible_user_dir }}/.ssh/config"
         marker: "## {mark} {{ vm }} {{ inventory_hostname }}"
         state: absent
         create: true
@@ -332,7 +332,7 @@
 - name: Clean local ssh config
   vars:
     cifmw_ssh_jumper_target: 'localhost'
-    cifmw_ssh_jumper_config_dir: "{{ lookup('env', 'HOME') }}/.ssh"
+    cifmw_ssh_jumper_config_dir: "{{ ansible_user_dir }}/.ssh"
   ansible.builtin.include_role:
     name: "ssh_jumper"
     tasks_from: "cleanup.yml"

roles/libvirt_manager/tasks/manage_vms.yml

@@ -40,7 +40,7 @@
       target: localhost
       proxy_host: "{{ ansible_host | default(inventory_hostname) }}"
       proxy_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
-      ssh_dir: "{{ lookup('env', 'HOME') }}/.ssh"
+      ssh_dir: "{{ ansible_user_dir }}/.ssh"
     ssh_ident:
       identity_file: >-
         {{

roles/nat64_appliance/molecule/default/cleanup.yml

@@ -1,7 +1,5 @@
 - name: Cleanup
   hosts: instance
-  vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
   tasks:
     - name: "Destroy the test-node"
       community.libvirt.virt:

roles/nat64_appliance/molecule/default/converge.yml

@@ -17,7 +17,6 @@
 - name: Converge
   hosts: instance
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
   tasks:
     - name: Crate SSH keypair

roles/nat64_appliance/molecule/default/prepare.yml

@@ -17,7 +17,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
   pre_tasks:
     - name: Create custom basedir

roles/openshift_provisioner_node/molecule/default/converge.yml

@@ -19,7 +19,6 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir ~ '/.crc/bin:' ~ ansible_user_dir ~ '/.crc/bin/oc:' ~ ansible_user_dir ~ '/bin:' ~ ansible_env.PATH }}"
     cifmw_opn_dry_run: true
     cifmw_use_opn: true

roles/openshift_provisioner_node/molecule/default/prepare.yml

@@ -19,7 +19,6 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_use_libvirt_manager: true

roles/reproducer/tasks/parse_cifmw_job_uri.yml

@@ -17,8 +17,7 @@
 
     - name: Extract job id for later reference
       vars:
-        user_dir: "{{ lookup('env', 'HOME') }}"
-        basedir: "{{ user_dir ~ '/ci-framework-data' }}"
+        basedir: "{{ ansible_user_dir ~ '/ci-framework-data' }}"
         job_id: "{{ _matched_url| basename }}"
       ansible.builtin.set_fact:
         cacheable: true

roles/rhol_crc/molecule/add_crc_creds/converge.yml

@@ -18,7 +18,6 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Verify crc creds playbook

roles/rhol_crc/molecule/binary/cleanup.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Cleanup RHOL/CRC after tests

roles/rhol_crc/molecule/default/cleanup.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Cleanup CRC

roles/rhol_crc/molecule/default/converge.yml

@@ -18,7 +18,6 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
     cifmw_manage_secrets_pullsecret_content: >
       {"auths":{"fake":{"auth": "Zm9vOmJhcgo="}}}

roles/rhol_crc/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     async_duration: 6000
   tasks:

roles/rhol_crc/molecule/find_crc/cleanup.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Cleanup RHOL/CRC after tests

roles/rhol_crc/molecule/get_versions/cleanup.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Cleanup RHOL/CRC after tests

roles/rhol_crc/molecule/get_versions/converge.yml

@@ -18,7 +18,6 @@
   hosts: all
   gather_facts: true
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
   tasks:
     - name: Get CRC and openshift versions