From 430d1887eec5e6353d8a96c2bda664c3137a96ef Mon Sep 17 00:00:00 2001 From: Amartya Sinha Date: Tue, 18 Nov 2025 12:01:03 +0530 Subject: [PATCH] [multiple] Move ansible_user_dir to group_vars [1/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 --- reproducer-clean.yml | 2 +- roles/ci_gen_kustomize_values/molecule/default/prepare.yml | 2 +- roles/cifmw_setup/defaults/main.yml | 1 - roles/rhol_crc/molecule/add_crc_creds/converge.yml | 1 - roles/rhol_crc/molecule/binary/cleanup.yml | 1 - roles/rhol_crc/molecule/default/cleanup.yml | 1 - roles/rhol_crc/molecule/default/converge.yml | 1 - roles/rhol_crc/molecule/default/prepare.yml | 1 - roles/rhol_crc/molecule/find_crc/cleanup.yml | 1 - roles/rhol_crc/molecule/get_versions/cleanup.yml | 1 - roles/rhol_crc/molecule/get_versions/converge.yml | 1 - 11 files changed, 2 insertions(+), 11 deletions(-) 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/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/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