diff --git a/create-infra.yml b/create-infra.yml index 089708ad43..0c8f7e70ca 100644 --- a/create-infra.yml +++ b/create-infra.yml @@ -151,7 +151,7 @@ - name: Set permissions on /home/zuul/ci-framework-data on controller-0 ansible.builtin.file: - path: "{{ cifmw_basedir | default('/home/zuul/ci-framework-data') }}" + path: "{{ cifmw_basedir }}" state: directory recurse: true owner: "{{ ansible_user_id }}" diff --git a/group_vars/all.yml b/group_vars/all.yml index 3a84ffffbc..92bfb2e507 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -1,6 +1,6 @@ --- # This file contains all repeating variables, that can be set -# globaly instead of parse Zuul inventory file to get proper value. +# globally instead of parse Zuul inventory file to get proper value. #### GLOBAL VARS #### ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_project_dir: src/github.com/openstack-k8s-operators/ci-framework @@ -8,3 +8,4 @@ cifmw_project_dir_absolute: "{{ ansible_user_dir }}/{{ cifmw_project_dir }}" cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/install_yamls # since cifmw_installyamls_repos var already exists, let's use that and move all definition here in single place instead of creating another variable. cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}" +cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" diff --git a/playbooks/01-bootstrap.yml b/playbooks/01-bootstrap.yml index 912aefd9a2..7669b6053d 100644 --- a/playbooks/01-bootstrap.yml +++ b/playbooks/01-bootstrap.yml @@ -71,5 +71,5 @@ - always ansible.builtin.copy: mode: "0644" - dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/custom-params.yml" + dest: "{{ cifmw_basedir }}/artifacts/parameters/custom-params.yml" content: "{{ ci_framework_params | to_nice_yaml }}" diff --git a/playbooks/99-logs.yml b/playbooks/99-logs.yml index 54bbe6d57b..c4e3c9339a 100644 --- a/playbooks/99-logs.yml +++ b/playbooks/99-logs.yml @@ -44,7 +44,7 @@ logfiles_dest_dir: >- {{ ( - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data'), + cifmw_basedir, 'logs/', now(fmt='%Y-%m-%d_%H-%M') ) | path_join @@ -104,7 +104,7 @@ dest: >- {{ ( - cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data'), + cifmw_basedir, "artifacts/ansible_facts." + now(fmt='%Y-%m-%d_%H-%M') ) | path_join }} diff --git a/plugins/modules/generate_make_tasks.py b/plugins/modules/generate_make_tasks.py index ff72a9026d..2f97c5f100 100644 --- a/plugins/modules/generate_make_tasks.py +++ b/plugins/modules/generate_make_tasks.py @@ -74,7 +74,7 @@ until: "{{ make_%(target)s_until | default(true) }}" register: "make_%(target)s_status" cifmw.general.ci_script: - output_dir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts" + output_dir: "{{ cifmw_basedir }}/artifacts" chdir: "%(chdir)s" script: "make %(target)s" dry_run: "{{ make_%(target)s_dryrun|default(false)|bool }}" diff --git a/roles/artifacts/defaults/main.yml b/roles/artifacts/defaults/main.yml index eabd9427a6..788219c653 100644 --- a/roles/artifacts/defaults/main.yml +++ b/roles/artifacts/defaults/main.yml @@ -17,7 +17,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_artifacts" -cifmw_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_artifacts_basedir: "{{ cifmw_basedir }}" cifmw_artifacts_crc_host: "api.crc.testing" cifmw_artifacts_crc_user: "core" cifmw_artifacts_crc_sshkey: "~/.crc/machines/crc/id_ecdsa" diff --git a/roles/build_containers/defaults/main.yml b/roles/build_containers/defaults/main.yml index 9d8bc9c185..44db6c4b05 100644 --- a/roles/build_containers/defaults/main.yml +++ b/roles/build_containers/defaults/main.yml @@ -18,7 +18,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_build_containers" cifmw_build_containers_tcib_src: "https://github.com/openstack-k8s-operators/tcib" -cifmw_build_containers_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_build_containers_basedir: "{{ cifmw_basedir }}" cifmw_build_containers_authfile_path: ${XDG_RUNTIME_DIR}/containers/auth.json cifmw_build_containers_push_containers: false cifmw_build_containers_timestamper_cmd: >- diff --git a/roles/build_containers/molecule/default/prepare.yml b/roles/build_containers/molecule/default/prepare.yml index 2a369e1e82..92ccae0a3e 100644 --- a/roles/build_containers/molecule/default/prepare.yml +++ b/roles/build_containers/molecule/default/prepare.yml @@ -17,9 +17,6 @@ - name: Prepare hosts: all - vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" - cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data/" roles: - role: test_deps - role: repo_setup diff --git a/roles/build_openstack_packages/defaults/main.yml b/roles/build_openstack_packages/defaults/main.yml index 549c7c4967..0825f323ba 100644 --- a/roles/build_openstack_packages/defaults/main.yml +++ b/roles/build_openstack_packages/defaults/main.yml @@ -31,7 +31,7 @@ cifmw_bop_dlrn_deps: - sqlite - python3-libselinux -cifmw_bop_build_repo_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/logs" +cifmw_bop_build_repo_dir: "{{ cifmw_basedir }}/logs" cifmw_bop_artifacts_basedir: "{{ ansible_user_dir ~ '/ci-framework-data' }}" cifmw_bop_dlrn_repo_url: "https://github.com/openstack-packages/DLRN.git" cifmw_bop_dlrn_from_source: false diff --git a/roles/build_push_container/defaults/main.yml b/roles/build_push_container/defaults/main.yml index a29b96f6e0..ae1ff81498 100644 --- a/roles/build_push_container/defaults/main.yml +++ b/roles/build_push_container/defaults/main.yml @@ -18,7 +18,7 @@ # All variables within this role should have a prefix of "cifmw_build_push_container" # Meta vars -cifmw_build_push_container_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_build_push_container_basedir: "{{ cifmw_basedir }}" cifmw_build_push_container_artifacts: "{{ (cifmw_build_push_container_basedir, 'artifacts', 'build_push_container')| ansible.builtin.path_join }}" # Build vars diff --git a/roles/cert_manager/defaults/main.yml b/roles/cert_manager/defaults/main.yml index ba473507ef..ec9c6fe653 100644 --- a/roles/cert_manager/defaults/main.yml +++ b/roles/cert_manager/defaults/main.yml @@ -18,7 +18,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_cert_manager" -cifmw_cert_manager_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_cert_manager_basedir: "{{ cifmw_basedir }}" cifmw_cert_manager_manifests_dir: "{{ cifmw_manifests | default(cifmw_cert_manager_basedir ~ '/artifacts/manifests') }}/cert-manager" cifmw_cert_manager_operator_namespace: cert-manager-operator cifmw_cert_manager_openshift_version: stable-v1 diff --git a/roles/ci_gen_kustomize_values/defaults/main.yml b/roles/ci_gen_kustomize_values/defaults/main.yml index 25b81fc785..32596fbdd2 100644 --- a/roles/ci_gen_kustomize_values/defaults/main.yml +++ b/roles/ci_gen_kustomize_values/defaults/main.yml @@ -17,10 +17,7 @@ # Top-level parameter shared with deploy_kustomize role cifmw_architecture_scenario: null -cifmw_ci_gen_kustomize_values_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_ci_gen_kustomize_values_basedir: "{{ cifmw_basedir }}" cifmw_ci_gen_kustomize_values_architecture_repo: >- {{ diff --git a/roles/ci_local_storage/defaults/main.yml b/roles/ci_local_storage/defaults/main.yml index 8fc01b1886..c10e036e3e 100644 --- a/roles/ci_local_storage/defaults/main.yml +++ b/roles/ci_local_storage/defaults/main.yml @@ -18,7 +18,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_cls" -cifmw_cls_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_cls_basedir: "{{ cifmw_basedir }}" cifmw_cls_manifests_dir: "{{ cifmw_manifests | default(cifmw_cls_basedir ~ '/artifacts/manifests') }}/storage" cifmw_cls_storage_class: local-storage cifmw_cls_storage_capacity: 10Gi diff --git a/roles/ci_lvms_storage/defaults/main.yml b/roles/ci_lvms_storage/defaults/main.yml index bf7cd3e71f..40c48ec094 100644 --- a/roles/ci_lvms_storage/defaults/main.yml +++ b/roles/ci_lvms_storage/defaults/main.yml @@ -20,7 +20,7 @@ cifmw_lvms_disk_list: [] cifmw_lvms_cluster_name: lvmcluster cifmw_lvms_namespace: openshift-lvm-storage -cifmw_lvms_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_lvms_basedir: "{{ cifmw_basedir }}" cifmw_lvms_manifests_dir: "{{ cifmw_manifests | default(cifmw_lvms_basedir ~ '/artifacts/manifests') }}/lvms" # The "lvms-" prefix is prepended to the cifmw_lvms_storage_class by the lvm-operator cifmw_lvms_storage_class: local-storage diff --git a/roles/ci_multus/defaults/main.yml b/roles/ci_multus/defaults/main.yml index 31a96ce913..3652ccd89f 100644 --- a/roles/ci_multus/defaults/main.yml +++ b/roles/ci_multus/defaults/main.yml @@ -18,7 +18,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_ci_multus" -cifmw_ci_multus_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_ci_multus_basedir: "{{ cifmw_basedir }}" cifmw_ci_multus_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_multus_basedir ~ '/artifacts/manifests') }}/ci_multus" cifmw_ci_multus_namespace: "openstack" cifmw_ci_multus_ocp_hostname: "crc" diff --git a/roles/ci_nmstate/defaults/main.yml b/roles/ci_nmstate/defaults/main.yml index 39cbcdf5e0..7aa61603d7 100644 --- a/roles/ci_nmstate/defaults/main.yml +++ b/roles/ci_nmstate/defaults/main.yml @@ -17,7 +17,7 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_ci_nmstate" -cifmw_ci_nmstate_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_ci_nmstate_basedir: "{{ cifmw_basedir }}" cifmw_ci_nmstate_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_nmstate_basedir ~ '/artifacts/manifests') }}/nmstate" cifmw_ci_nmstate_configs_dir: "{{ cifmw_ci_nmstate_basedir }}/artifacts/nmstate" cifmw_ci_nmstate_namespace: openshift-nmstate