Move cifmw_basedir var to group_vars - part two

group_vars/all.yml

@@ -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"

roles/ci_setup/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_setup"
 
-cifmw_ci_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_ci_setup_basedir: "{{ cifmw_basedir }}"
 cifmw_ci_setup_openshift_client_version: "stable"
 cifmw_ci_setup_oc_install_path: "{{ ansible_user_dir ~ '/bin' }}"
 cifmw_ci_setup_epel_pkgs: []

roles/cifmw_cephadm/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # defaults file for cifmw_cephadm
-cifmw_cephadm_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_cephadm_basedir: "{{ cifmw_basedir }}"
 cifmw_cephadm_spec_on_bootstrap: false  # not recommended due to https://tracker.ceph.com/issues/49277
 cifmw_cephadm_ssh_user: ceph-admin
 cifmw_cephadm_bin: /usr/sbin/cephadm

roles/cifmw_external_dns/defaults/main.yml

@@ -23,7 +23,7 @@ cifmw_external_dns_check_mode: false
 cifmw_external_dns_certificate_dir: /etc/pki/tls/
 cifmw_external_dns_certificate: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.crt"
 cifmw_external_dns_key: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.key"
-cifmw_external_dns_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_external_dns_basedir: "{{ cifmw_basedir }}"
 cifmw_external_dns_manifests_dir: "{{ cifmw_manifests | default(cifmw_external_dns_basedir ~ '/artifacts/manifests') }}/cifmw_external_dns"
 # Important: use the same rootca-public as openstack
 cifmw_external_dns_cert_issuer_ref:

roles/cifmw_setup/tasks/bootstrap.yml

@@ -63,5 +63,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 }}"

roles/cifmw_setup/tasks/run_logs.yml

@@ -38,7 +38,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
@@ -97,7 +97,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
           }}

roles/compliance/defaults/main.yml

@@ -17,7 +17,7 @@
 
 # defaults file for compliance role
 
-cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/compliance"
+cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir }}/tests/compliance"
 cifmw_compliance_cleanup: true
 
 # A list of available profiles can be found using "oscap info /usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml"

roles/config_drive/defaults/main.yml

@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_config_drive"
-cifmw_config_drive_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_config_drive_basedir: "{{ cifmw_basedir }}"
 cifmw_config_drive_workdir: >-
   {{ cifmw_config_drive_basedir }}/artifacts/cifmw_config_drive
 

roles/copy_container/defaults/main.yml

@@ -6,4 +6,4 @@ enable_cron_c9: true
 # NEW names for conventions
 cifmw_copy_ct_enable_cron: "{{ enable_cron }}"
 cifmw_copy_ct_enable_cron_c9: "{{ enable_cron_c9 }}"
-cifmw_copy_ct_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_copy_ct_basedir: "{{ cifmw_basedir }}"

roles/dlrn_promote/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_dlrn_report"
 
-cifmw_dlrn_promote_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_dlrn_promote_workspace: "{{ cifmw_basedir }}"
 cifmw_dlrn_promote_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}"
 cifmw_dlrn_promote_kerberos_auth: false
 cifmw_dlrn_promote_dlrnapi_host_principal: ""

roles/dlrn_report/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_dlrn_report"
 
-cifmw_dlrn_report_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_dlrn_report_workspace: "{{ cifmw_basedir }}"
 cifmw_dlrn_report_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}"
 cifmw_dlrn_report_kerberos_auth: false
 cifmw_dlrn_report_result: true

roles/edpm_build_images/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_edpm_build_images"
 
-cifmw_edpm_build_images_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_build_images_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_build_images_via_rpm: true
 cifmw_edpm_build_images_host_packages:
   - diskimage-builder

roles/edpm_deploy/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_edpm_deploy"
-cifmw_edpm_deploy_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_deploy_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_deploy_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_deploy_retries: 100
 cifmw_edpm_deploy_run_validation: false

roles/edpm_deploy_baremetal/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_edpm_deploy_baremetal"
-cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_deploy_baremetal_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_baremetal_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_deploy_baremetal_dry_run: false
 cifmw_edpm_deploy_baremetal_wait_provisionserver_retries: 60

roles/edpm_kustomize/defaults/main.yml

@@ -17,5 +17,5 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_edpm_kustomize"
-cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_kustomize_artifacts_dir: "{{ cifmw_edpm_kustomize_basedir ~ '/artifacts' }}"

roles/edpm_prepare/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_edpm_prepare"
-cifmw_edpm_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_edpm_prepare_basedir: "{{ cifmw_basedir }}"
 cifmw_edpm_prepare_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_prepare_basedir ~ '/artifacts/manifests') }}"
 cifmw_edpm_prepare_oc_retries: 30
 cifmw_edpm_prepare_oc_delay: 30

roles/env_op_images/defaults/main.yml

@@ -18,6 +18,6 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_env_op_images"
 
-cifmw_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_env_op_images_dir: "{{ cifmw_basedir }}"
 cifmw_env_op_images_file: operator_images.yaml
 cifmw_env_op_images_dryrun: false

roles/env_op_images/molecule/default/converge.yml

@@ -20,7 +20,7 @@
   vars:
     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_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+    cifmw_env_op_images_dir: "{{ cifmw_basedir }}"
     cifmw_env_op_images_file: operator_images.yaml
     cifmw_env_op_images_dryrun: true
     cifmw_install_yamls_environment:

roles/hci_prepare/defaults/main.yml

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-cifmw_hci_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_hci_prepare_basedir: "{{ cifmw_basedir }}"
 cifmw_hci_prepare_dataplane_dir: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane"
 cifmw_hci_prepare_dryrun: false
 cifmw_hci_prepare_skip_load_parameters: false

roles/hive/defaults/main.yml

@@ -20,7 +20,7 @@
 
 cifmw_hive_dry_run: false
 
-cifmw_hive_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_hive_basedir: "{{ cifmw_basedir }}"
 cifmw_hive_artifacts_dir: "{{ cifmw_hive_basedir }}/artifacts/hive"
 
 cifmw_hive_oc_delete_timeout: 300

roles/install_yamls/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_install_yamls"
 cifmw_install_yamls_envfile: "install_yamls.sh"
-cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir }}"
 cifmw_install_yamls_out_dir: "{{ cifmw_install_yamls_out_dir_basedir }}/artifacts"
 cifmw_install_yamls_manifests_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/manifests') }}"
 cifmw_install_yamls_edpm_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/edpm') }}"

roles/install_yamls/tasks/main.yml

@@ -24,7 +24,7 @@
   loop:
     - "{{ cifmw_install_yamls_out_dir }}"
     - "{{ cifmw_install_yamls_tasks_out }}"
-    - "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters"
+    - "{{ cifmw_basedir }}/artifacts/parameters"
 
 - name: Create variables with local repos based on Zuul items
   tags:
@@ -159,7 +159,7 @@
   tags:
     - bootstrap
   ansible.builtin.copy:
-    dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+    dest: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
     content: >-
       {{
         {