diff --git a/roles/build_containers/molecule/default/prepare.yml b/roles/build_containers/molecule/default/prepare.yml index 2a369e1e82..4b92070430 100644 --- a/roles/build_containers/molecule/default/prepare.yml +++ b/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 diff --git a/roles/build_containers/molecule/hotfix/prepare.yml b/roles/build_containers/molecule/hotfix/prepare.yml index 2a369e1e82..4b92070430 100644 --- a/roles/build_containers/molecule/hotfix/prepare.yml +++ b/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 diff --git a/roles/build_openstack_packages/molecule/default/converge.yml b/roles/build_openstack_packages/molecule/default/converge.yml index 31c1356e18..dddda28a1e 100644 --- a/roles/build_openstack_packages/molecule/default/converge.yml +++ b/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 diff --git a/roles/build_openstack_packages/molecule/default/prepare.yml b/roles/build_openstack_packages/molecule/default/prepare.yml index ba0e8f86f8..9f1ea0b62b 100644 --- a/roles/build_openstack_packages/molecule/default/prepare.yml +++ b/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 diff --git a/roles/cert_manager/tasks/validate_certs.yml b/roles/cert_manager/tasks/validate_certs.yml index 49c3a754a2..87786f6a79 100644 --- a/roles/cert_manager/tasks/validate_certs.yml +++ b/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" diff --git a/roles/devscripts/molecule/default/prepare.yml b/roles/devscripts/molecule/default/prepare.yml index 683c54952f..78bb43ce72 100644 --- a/roles/devscripts/molecule/default/prepare.yml +++ b/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 diff --git a/roles/edpm_build_images/molecule/default/converge.yml b/roles/edpm_build_images/molecule/default/converge.yml index e9ff2242c3..05ea6c710e 100644 --- a/roles/edpm_build_images/molecule/default/converge.yml +++ b/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: diff --git a/roles/hci_prepare/molecule/default/converge.yml b/roles/hci_prepare/molecule/default/converge.yml index acf1860801..a4ba3f0c97 100644 --- a/roles/hci_prepare/molecule/default/converge.yml +++ b/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" diff --git a/roles/hive/molecule/default/converge.yml b/roles/hive/molecule/default/converge.yml index 1617ee4d47..abaaf53154 100644 --- a/roles/hive/molecule/default/converge.yml +++ b/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 diff --git a/roles/hive/molecule/default/prepare.yml b/roles/hive/molecule/default/prepare.yml index 1e1fb6b259..08cf3aefbc 100644 --- a/roles/hive/molecule/default/prepare.yml +++ b/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: diff --git a/roles/reproducer/tasks/parse_cifmw_job_uri.yml b/roles/reproducer/tasks/parse_cifmw_job_uri.yml index 73ee62d86f..6686da8b5f 100644 --- a/roles/reproducer/tasks/parse_cifmw_job_uri.yml +++ b/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 diff --git a/roles/run_hook/molecule/default/prepare.yml b/roles/run_hook/molecule/default/prepare.yml index bad6d093d5..b3a877abec 100644 --- a/roles/run_hook/molecule/default/prepare.yml +++ b/roles/run_hook/molecule/default/prepare.yml @@ -16,8 +16,6 @@ - name: Prepare hosts: all - vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" tasks: - name: Create dummy env file ansible.builtin.copy: