diff --git a/reproducer-clean.yml b/reproducer-clean.yml index 68ba76654e..d8487477c9 100644 --- a/reproducer-clean.yml +++ b/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 diff --git a/roles/adoption_osp_deploy/molecule/default/converge.yml b/roles/adoption_osp_deploy/molecule/default/converge.yml index 7e33851b40..9e88ebe7d3 100644 --- a/roles/adoption_osp_deploy/molecule/default/converge.yml +++ b/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 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/ci_gen_kustomize_values/molecule/default/prepare.yml b/roles/ci_gen_kustomize_values/molecule/default/prepare.yml index b11327d265..f6dc328a34 100644 --- a/roles/ci_gen_kustomize_values/molecule/default/prepare.yml +++ b/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 }} diff --git a/roles/cifmw_setup/defaults/main.yml b/roles/cifmw_setup/defaults/main.yml index 74cdfebb7a..9f1daf97dc 100644 --- a/roles/cifmw_setup/defaults/main.yml +++ b/roles/cifmw_setup/defaults/main.yml @@ -1,3 +1,2 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" openstack_namespace: openstack diff --git a/roles/compliance/molecule/default/converge.yml b/roles/compliance/molecule/default/converge.yml index 31b95ac11b..b4e0253585 100644 --- a/roles/compliance/molecule/default/converge.yml +++ b/roles/compliance/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge test of controller tasks hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_compliance_dry_run: true roles: - role: "compliance" @@ -26,7 +25,6 @@ - name: Converge test of compute tasks hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_compliance_dry_run: true roles: - role: "compliance" 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/edpm_deploy/molecule/default/converge.yml b/roles/edpm_deploy/molecule/default/converge.yml index 5fa7bc7a57..0ba92a5a73 100644 --- a/roles/edpm_deploy/molecule/default/converge.yml +++ b/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" diff --git a/roles/edpm_deploy/molecule/default/prepare.yml b/roles/edpm_deploy/molecule/default/prepare.yml index 2a57c338aa..76fa523e6e 100644 --- a/roles/edpm_deploy/molecule/default/prepare.yml +++ b/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 diff --git a/roles/edpm_deploy_baremetal/molecule/default/prepare.yml b/roles/edpm_deploy_baremetal/molecule/default/prepare.yml index 39b3a811a3..2ff6b81100 100644 --- a/roles/edpm_deploy_baremetal/molecule/default/prepare.yml +++ b/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: diff --git a/roles/edpm_prepare/molecule/default/prepare.yml b/roles/edpm_prepare/molecule/default/prepare.yml index 810486ac1a..0c6d526931 100644 --- a/roles/edpm_prepare/molecule/default/prepare.yml +++ b/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: 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/install_ca/molecule/default/converge.yml b/roles/install_ca/molecule/default/converge.yml index c6e7219105..5479b74b42 100644 --- a/roles/install_ca/molecule/default/converge.yml +++ b/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: diff --git a/roles/install_ca/molecule/default/prepare.yml b/roles/install_ca/molecule/default/prepare.yml index f845024f5a..8e568ef5c8 100644 --- a/roles/install_ca/molecule/default/prepare.yml +++ b/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: diff --git a/roles/install_yamls/molecule/default/converge.yml b/roles/install_yamls/molecule/default/converge.yml index 1835746df9..361b157744 100644 --- a/roles/install_yamls/molecule/default/converge.yml +++ b/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 diff --git a/roles/libvirt_manager/defaults/main.yml b/roles/libvirt_manager/defaults/main.yml index 144a964937..ca299d84bc 100644 --- a/roles/libvirt_manager/defaults/main.yml +++ b/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" diff --git a/roles/libvirt_manager/molecule/boot_order/converge.yml b/roles/libvirt_manager/molecule/boot_order/converge.yml index 4b3d7b3aab..1c3506e877 100644 --- a/roles/libvirt_manager/molecule/boot_order/converge.yml +++ b/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: diff --git a/roles/libvirt_manager/molecule/check_dns/converge.yml b/roles/libvirt_manager/molecule/check_dns/converge.yml index a35a9ee1c7..3298d1cf79 100644 --- a/roles/libvirt_manager/molecule/check_dns/converge.yml +++ b/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: diff --git a/roles/libvirt_manager/molecule/deploy_layout/converge.yml b/roles/libvirt_manager/molecule/deploy_layout/converge.yml index 77e3099fe5..0f67829929 100644 --- a/roles/libvirt_manager/molecule/deploy_layout/converge.yml +++ b/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 diff --git a/roles/libvirt_manager/molecule/ocp_layout/converge.yml b/roles/libvirt_manager/molecule/ocp_layout/converge.yml index 549f3491e2..2d757ad9fe 100644 --- a/roles/libvirt_manager/molecule/ocp_layout/converge.yml +++ b/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: diff --git a/roles/libvirt_manager/molecule/spine_leaf/converge.yml b/roles/libvirt_manager/molecule/spine_leaf/converge.yml index 9b3a79d15b..ad158e9b89 100644 --- a/roles/libvirt_manager/molecule/spine_leaf/converge.yml +++ b/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: diff --git a/roles/libvirt_manager/molecule/spine_leaf/verify.yml b/roles/libvirt_manager/molecule/spine_leaf/verify.yml index c75516b0db..fce75f14fe 100644 --- a/roles/libvirt_manager/molecule/spine_leaf/verify.yml +++ b/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: >- {{ diff --git a/roles/libvirt_manager/tasks/clean_layout.yml b/roles/libvirt_manager/tasks/clean_layout.yml index 11d22bceff..dd609139e0 100644 --- a/roles/libvirt_manager/tasks/clean_layout.yml +++ b/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" diff --git a/roles/libvirt_manager/tasks/manage_vms.yml b/roles/libvirt_manager/tasks/manage_vms.yml index b41a943f05..9ffbb4c2cd 100644 --- a/roles/libvirt_manager/tasks/manage_vms.yml +++ b/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: >- {{ diff --git a/roles/nat64_appliance/molecule/default/cleanup.yml b/roles/nat64_appliance/molecule/default/cleanup.yml index 395b8b1fda..28d4a5a528 100644 --- a/roles/nat64_appliance/molecule/default/cleanup.yml +++ b/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: diff --git a/roles/nat64_appliance/molecule/default/converge.yml b/roles/nat64_appliance/molecule/default/converge.yml index c321d6d1c2..8421a4c576 100644 --- a/roles/nat64_appliance/molecule/default/converge.yml +++ b/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 diff --git a/roles/nat64_appliance/molecule/default/prepare.yml b/roles/nat64_appliance/molecule/default/prepare.yml index 99ae481dd7..83d82c7989 100644 --- a/roles/nat64_appliance/molecule/default/prepare.yml +++ b/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 diff --git a/roles/openshift_provisioner_node/molecule/default/converge.yml b/roles/openshift_provisioner_node/molecule/default/converge.yml index 15ac7e03fe..9697682865 100644 --- a/roles/openshift_provisioner_node/molecule/default/converge.yml +++ b/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 diff --git a/roles/openshift_provisioner_node/molecule/default/prepare.yml b/roles/openshift_provisioner_node/molecule/default/prepare.yml index 29b0d54557..48d469f259 100644 --- a/roles/openshift_provisioner_node/molecule/default/prepare.yml +++ b/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 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/rhol_crc/molecule/add_crc_creds/converge.yml b/roles/rhol_crc/molecule/add_crc_creds/converge.yml index f96c0addb0..3db5c64b6c 100644 --- a/roles/rhol_crc/molecule/add_crc_creds/converge.yml +++ b/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 diff --git a/roles/rhol_crc/molecule/binary/cleanup.yml b/roles/rhol_crc/molecule/binary/cleanup.yml index 0c084d76c5..a3e003a09d 100644 --- a/roles/rhol_crc/molecule/binary/cleanup.yml +++ b/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 diff --git a/roles/rhol_crc/molecule/default/cleanup.yml b/roles/rhol_crc/molecule/default/cleanup.yml index cbc74a7971..76fed228e1 100644 --- a/roles/rhol_crc/molecule/default/cleanup.yml +++ b/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 diff --git a/roles/rhol_crc/molecule/default/converge.yml b/roles/rhol_crc/molecule/default/converge.yml index bd9afe9b46..524d7d2dfc 100644 --- a/roles/rhol_crc/molecule/default/converge.yml +++ b/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="}}} diff --git a/roles/rhol_crc/molecule/default/prepare.yml b/roles/rhol_crc/molecule/default/prepare.yml index d9a08b4ebb..fd0041a7f3 100644 --- a/roles/rhol_crc/molecule/default/prepare.yml +++ b/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: diff --git a/roles/rhol_crc/molecule/find_crc/cleanup.yml b/roles/rhol_crc/molecule/find_crc/cleanup.yml index 0c084d76c5..a3e003a09d 100644 --- a/roles/rhol_crc/molecule/find_crc/cleanup.yml +++ b/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 diff --git a/roles/rhol_crc/molecule/get_versions/cleanup.yml b/roles/rhol_crc/molecule/get_versions/cleanup.yml index 0c084d76c5..a3e003a09d 100644 --- a/roles/rhol_crc/molecule/get_versions/cleanup.yml +++ b/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 diff --git a/roles/rhol_crc/molecule/get_versions/converge.yml b/roles/rhol_crc/molecule/get_versions/converge.yml index 539cd3c8e7..c85ae7f344 100644 --- a/roles/rhol_crc/molecule/get_versions/converge.yml +++ b/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 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: diff --git a/roles/shiftstack/molecule/default/cleanup.yml b/roles/shiftstack/molecule/default/cleanup.yml index e53697447f..27d3f74744 100644 --- a/roles/shiftstack/molecule/default/cleanup.yml +++ b/roles/shiftstack/molecule/default/cleanup.yml @@ -17,7 +17,6 @@ - name: Cleanup 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_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" openstack_namespace_name: openstack diff --git a/roles/shiftstack/molecule/default/converge.yml b/roles/shiftstack/molecule/default/converge.yml index fb30de5414..aaaac4a037 100644 --- a/roles/shiftstack/molecule/default/converge.yml +++ b/roles/shiftstack/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge 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_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" cifmw_shiftstack_run_playbook: cifmw-gate.yaml diff --git a/roles/shiftstack/molecule/default/prepare.yml b/roles/shiftstack/molecule/default/prepare.yml index 531e0efe44..889aa9f6f5 100644 --- a/roles/shiftstack/molecule/default/prepare.yml +++ b/roles/shiftstack/molecule/default/prepare.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 }}" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" openstack_namespace_name: openstack diff --git a/roles/tempest/molecule/default/converge.yml b/roles/tempest/molecule/default/converge.yml index d14ceb88eb..338a069ad9 100644 --- a/roles/tempest/molecule/default/converge.yml +++ b/roles/tempest/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_tempest_dry_run: true roles: - role: "tempest" diff --git a/roles/tempest/molecule/default/prepare.yml b/roles/tempest/molecule/default/prepare.yml index 810486ac1a..0c6d526931 100644 --- a/roles/tempest/molecule/default/prepare.yml +++ b/roles/tempest/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: diff --git a/roles/test_operator/molecule/default/converge.yml b/roles/test_operator/molecule/default/converge.yml index a90f6c812d..85508e5a92 100644 --- a/roles/test_operator/molecule/default/converge.yml +++ b/roles/test_operator/molecule/default/converge.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_test_operator_dry_run: true roles: - role: "test_operator" diff --git a/roles/test_operator/molecule/default/prepare.yml b/roles/test_operator/molecule/default/prepare.yml index a90f6c812d..85508e5a92 100644 --- a/roles/test_operator/molecule/default/prepare.yml +++ b/roles/test_operator/molecule/default/prepare.yml @@ -18,7 +18,6 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_test_operator_dry_run: true roles: - role: "test_operator" diff --git a/roles/tofu/molecule/default/prepare.yml b/roles/tofu/molecule/default/prepare.yml index d6287b5be6..822af8b1e9 100644 --- a/roles/tofu/molecule/default/prepare.yml +++ b/roles/tofu/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: diff --git a/roles/update/molecule/default/converge.yml b/roles/update/molecule/default/converge.yml index d5482b8bb8..fb4aae26d1 100644 --- a/roles/update/molecule/default/converge.yml +++ b/roles/update/molecule/default/converge.yml @@ -18,9 +18,8 @@ - name: Converge hosts: all vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_update_run_dryrun: true - cifmw_openshift_kubeconfig: "{{ lookup('env', 'HOME') }}/.crc/machines/crc/kubeconfig" + cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" cifmw_nolog: false tasks: - name: Initialize monitoring diff --git a/roles/update/molecule/default/prepare.yml b/roles/update/molecule/default/prepare.yml index 15e5eefb1b..5a145c1b3d 100644 --- a/roles/update/molecule/default/prepare.yml +++ b/roles/update/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 diff --git a/scenarios/centos-9/ci.yml b/scenarios/centos-9/ci.yml index a0340e03fc..95e9357bb7 100644 --- a/scenarios/centos-9/ci.yml +++ b/scenarios/centos-9/ci.yml @@ -1,6 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" - cifmw_openshift_user: "kubeadmin" cifmw_openshift_password: "123456789" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" diff --git a/scenarios/centos-9/content_provider.yml b/scenarios/centos-9/content_provider.yml index a51b7a9537..049da1da5d 100644 --- a/scenarios/centos-9/content_provider.yml +++ b/scenarios/centos-9/content_provider.yml @@ -1,5 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_operator_build_push_registry: "{{ cifmw_rp_registry_ip | default('localhost') }}:5001" cifmw_operator_build_push_org: "openstack-k8s-operators" cifmw_operator_build_org: "openstack-k8s-operators" diff --git a/scenarios/centos-9/edpm_baremetal_deployment_ci.yml b/scenarios/centos-9/edpm_baremetal_deployment_ci.yml index f2a859afea..fa9fb2a8ff 100644 --- a/scenarios/centos-9/edpm_baremetal_deployment_ci.yml +++ b/scenarios/centos-9/edpm_baremetal_deployment_ci.yml @@ -1,5 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_install_yamls_vars: DEPLOY_DIR: "{{ cifmw_basedir }}/artifacts/edpm_compute" # used during Baremetal deployment BMAAS_INSTANCE_MEMORY: 8192 diff --git a/scenarios/centos-9/edpm_build_images_content_provider.yml b/scenarios/centos-9/edpm_build_images_content_provider.yml index c6c53ff3cb..c49f405348 100644 --- a/scenarios/centos-9/edpm_build_images_content_provider.yml +++ b/scenarios/centos-9/edpm_build_images_content_provider.yml @@ -1,3 +1,2 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_edmp_build_images_push_registry: "{{ cifmw_rp_registry_ip | default('localhost') }}:5001" diff --git a/scenarios/centos-9/edpm_ci.yml b/scenarios/centos-9/edpm_ci.yml index dbf9ab6990..2ea5df6ffd 100644 --- a/scenarios/centos-9/edpm_ci.yml +++ b/scenarios/centos-9/edpm_ci.yml @@ -1,5 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_install_yamls_vars: BMO_SETUP: false INSTALL_CERT_MANAGER: false diff --git a/scenarios/centos-9/meta_content_provider.yml b/scenarios/centos-9/meta_content_provider.yml index a5317f7f22..0ebeba1ca9 100644 --- a/scenarios/centos-9/meta_content_provider.yml +++ b/scenarios/centos-9/meta_content_provider.yml @@ -1,6 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" - # build_operators vars cifmw_operator_build_push_registry: "{{ cifmw_rp_registry_ip }}:{{ cifmw_rp_registry_port }}" cifmw_operator_build_push_org: "openstack-k8s-operators" diff --git a/scenarios/centos-9/podified_common.yml b/scenarios/centos-9/podified_common.yml index c50db2a4b1..2c4066d997 100644 --- a/scenarios/centos-9/podified_common.yml +++ b/scenarios/centos-9/podified_common.yml @@ -1,8 +1,6 @@ --- # It is the common scenario file for EDPM multinode podified deployment -ansible_user_dir: "{{ lookup('env', 'HOME') }}" - cifmw_openshift_user: "kubeadmin" cifmw_openshift_password: "123456789" cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig" diff --git a/scenarios/centos-9/tcib.yml b/scenarios/centos-9/tcib.yml index b28f9ccab1..62023a89c1 100644 --- a/scenarios/centos-9/tcib.yml +++ b/scenarios/centos-9/tcib.yml @@ -1,5 +1,4 @@ --- -ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_build_containers_tcib_src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/tcib" cifmw_repo_setup_src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/repo-setup" cifmw_build_containers_repo_dir: "{{ cifmw_basedir }}/artifacts/repositories"