Move ansible_user_dir to group_vars [3/5]

This commit is one of the steps of replacing common used vars with group_vars to improve overall maintenance of variables in ci-framework

Signed-off-by: Amartya Sinha <[email protected]>

Author: amartyasinha

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/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/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: