diff --git a/group_vars/all.yml b/group_vars/all.yml index 3a84ffffbc..4add9afd8d 100644 --- a/group_vars/all.yml +++ b/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" diff --git a/roles/kustomize_deploy/defaults/main.yml b/roles/kustomize_deploy/defaults/main.yml index 8b42ff26d0..c6050a031f 100644 --- a/roles/kustomize_deploy/defaults/main.yml +++ b/roles/kustomize_deploy/defaults/main.yml @@ -19,10 +19,7 @@ # default resources -cifmw_kustomize_deploy_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_kustomize_deploy_basedir: "{{ cifmw_basedir }}" cifmw_kustomize_deploy_architecture_repo_url: "https://github.com/openstack-k8s-operators/architecture" diff --git a/roles/libvirt_manager/defaults/main.yml b/roles/libvirt_manager/defaults/main.yml index 144a964937..9b57f3250d 100644 --- a/roles/libvirt_manager/defaults/main.yml +++ b/roles/libvirt_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_libvirt_manager" -cifmw_libvirt_manager_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_libvirt_manager_basedir: "{{ cifmw_basedir }}" cifmw_libvirt_manager_enable_virtualization_module: false cifmw_libvirt_manager_user: "{{ ansible_user_id | default(lookup('env', 'USER')) }}" cifmw_libvirt_manager_images_url: https://cloud.centos.org/centos/9-stream/x86_64/images diff --git a/roles/manage_secrets/defaults/main.yml b/roles/manage_secrets/defaults/main.yml index 3e75038dd3..3d2f6123c9 100644 --- a/roles/manage_secrets/defaults/main.yml +++ b/roles/manage_secrets/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_manage_secrets" -cifmw_manage_secrets_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_manage_secrets_basedir: "{{ cifmw_basedir }}" cifmw_manage_secrets_owner: "{{ ansible_user_id }}" diff --git a/roles/mirror_registry/defaults/main.yml b/roles/mirror_registry/defaults/main.yml index c3e971e105..5311e5a904 100644 --- a/roles/mirror_registry/defaults/main.yml +++ b/roles/mirror_registry/defaults/main.yml @@ -21,4 +21,4 @@ cifmw_mirror_registry_install_dir: /opt/mirror-registry cifmw_mirror_registry_fqdn: quay.openstack.lab cifmw_mirror_registry_release_version: v1.3.10 -cifmw_mirror_registry_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_mirror_registry_basedir: "{{ cifmw_basedir }}" diff --git a/roles/nat64_appliance/defaults/main.yml b/roles/nat64_appliance/defaults/main.yml index 3c4ea8ac1b..ae7c36d271 100644 --- a/roles/nat64_appliance/defaults/main.yml +++ b/roles/nat64_appliance/defaults/main.yml @@ -14,10 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -cifmw_nat64_appliance_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_nat64_appliance_basedir: "{{ cifmw_basedir }}" cifmw_nat64_appliance_workdir: "{{ cifmw_nat64_appliance_basedir }}/nat64_appliance" cifmw_nat64_appliance_venv_dir: "{{ cifmw_nat64_appliance_workdir }}/venv" diff --git a/roles/networking_mapper/defaults/main.yml b/roles/networking_mapper/defaults/main.yml index f41b745e55..4f31c19d9e 100644 --- a/roles/networking_mapper/defaults/main.yml +++ b/roles/networking_mapper/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_networking_mapper" -cifmw_networking_mapper_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_networking_mapper_basedir: "{{ cifmw_basedir }}" cifmw_networking_mapper_infra_dir: "/etc/ci/env" cifmw_networking_mapper_networking_def_path: >- {{ cifmw_networking_mapper_infra_dir }}/networking-definition.yml diff --git a/roles/openshift_login/defaults/main.yml b/roles/openshift_login/defaults/main.yml index 4ac7f3eb4f..920ad5f0ee 100644 --- a/roles/openshift_login/defaults/main.yml +++ b/roles/openshift_login/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_openshift_login" -cifmw_openshift_login_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_openshift_login_basedir: "{{ cifmw_basedir }}" cifmw_openshift_login_kubeconfig_default_path: "{{ cifmw_openshift_login_basedir ~ '/.kube/config' }}" cifmw_openshift_login_force_refresh: false diff --git a/roles/openshift_login/tasks/main.yml b/roles/openshift_login/tasks/main.yml index f2a9f9d1a8..cdbf5a621c 100644 --- a/roles/openshift_login/tasks/main.yml +++ b/roles/openshift_login/tasks/main.yml @@ -96,7 +96,7 @@ cifmw_openshift_token: "{{ cifmw_openshift_token }}" {% endif %} ansible.builtin.copy: - dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/openshift-login-params.yml" + dest: "{{ cifmw_basedir }}/artifacts/parameters/openshift-login-params.yml" content: "{{ cifmw_openshift_login_params_content | from_yaml | to_nice_yaml }}" mode: "0600" - name: Update the install-yamls-params with KUBECONFIG @@ -104,7 +104,7 @@ block: - name: Read the install yamls parameters file ansible.builtin.slurp: - path: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml" + path: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml" register: cifmw_openshift_login_install_yamls_artifacts_slurp - name: Append the KUBECONFIG to the install yamls parameters @@ -119,5 +119,5 @@ } }, recursive=true) | to_nice_yaml }} - 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" mode: "0600" diff --git a/roles/openshift_provisioner_node/defaults/main.yml b/roles/openshift_provisioner_node/defaults/main.yml index de62500230..21cb7e19f7 100644 --- a/roles/openshift_provisioner_node/defaults/main.yml +++ b/roles/openshift_provisioner_node/defaults/main.yml @@ -21,6 +21,6 @@ cifmw_opn_external_bridge_name: "baremetal" cifmw_opn_prov_bridge_name: "provisioning" -cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_opn_basedir: "{{ cifmw_basedir }}" cifmw_opn_artifacts_dir: "{{ cifmw_opn_basedir }}/artifacts" cifmw_opn_dry_run: false diff --git a/roles/openshift_provisioner_node/molecule/default/converge.yml b/roles/openshift_provisioner_node/molecule/default/converge.yml index 15ac7e03fe..9f3d439bc1 100644 --- a/roles/openshift_provisioner_node/molecule/default/converge.yml +++ b/roles/openshift_provisioner_node/molecule/default/converge.yml @@ -25,7 +25,7 @@ cifmw_use_opn: true cifmw_opn_use_provisioning_network: false cifmw_opn_user: kni - cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}" + cifmw_opn_basedir: "{{ cifmw_basedir }}" tasks: - name: Including the openshift provisioner node role. diff --git a/roles/openshift_setup/defaults/main.yml b/roles/openshift_setup/defaults/main.yml index 2133089aeb..0acb473931 100644 --- a/roles/openshift_setup/defaults/main.yml +++ b/roles/openshift_setup/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_openshift_setup" -cifmw_openshift_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_openshift_setup_basedir: "{{ cifmw_basedir }}" cifmw_openshift_setup_dry_run: false cifmw_openshift_setup_create_namespaces: [] cifmw_openshift_setup_skip_internal_registry: false diff --git a/roles/operator_build/defaults/main.yml b/roles/operator_build/defaults/main.yml index a5f4dabb09..df5bb254e2 100644 --- a/roles/operator_build/defaults/main.yml +++ b/roles/operator_build/defaults/main.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -cifmw_operator_build_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_operator_build_basedir: "{{ cifmw_basedir }}" cifmw_operator_build_dryrun: false cifmw_operator_build_golang_ct: "docker.io/library/golang:1.20" cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.20" diff --git a/roles/operator_deploy/defaults/main.yml b/roles/operator_deploy/defaults/main.yml index 93eb9ca3dd..200a8e6819 100644 --- a/roles/operator_deploy/defaults/main.yml +++ b/roles/operator_deploy/defaults/main.yml @@ -19,7 +19,7 @@ # All variables within this role should have a prefix of "cifmw_operator_deploy" # output base directory -cifmw_operator_deploy_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_operator_deploy_basedir: "{{ cifmw_basedir }}" # List of operators you want to deploy cifmw_operator_deploy_list: [] # install_yamls repository location diff --git a/roles/os_must_gather/defaults/main.yml b/roles/os_must_gather/defaults/main.yml index aa7b8b9b1e..bbf4e70175 100644 --- a/roles/os_must_gather/defaults/main.yml +++ b/roles/os_must_gather/defaults/main.yml @@ -20,7 +20,7 @@ cifmw_os_must_gather_image: "quay.io/openstack-k8s-operators/openstack-must-gather:latest" cifmw_os_must_gather_image_push: true cifmw_os_must_gather_image_registry: "quay.rdoproject.org/openstack-k8s-operators" -cifmw_os_must_gather_output_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_os_must_gather_output_dir: "{{ cifmw_basedir }}" cifmw_os_must_gather_output_log_dir: "{{ cifmw_os_must_gather_output_dir }}/logs/openstack-must-gather" cifmw_os_must_gather_repo_path: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-must-gather" cifmw_os_must_gather_timeout: "10m" diff --git a/roles/ovirt/defaults/main.yml b/roles/ovirt/defaults/main.yml index 6182a925bd..f94eccc66c 100644 --- a/roles/ovirt/defaults/main.yml +++ b/roles/ovirt/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_ovirt" -cifmw_ovirt_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts" +cifmw_ovirt_artifacts_basedir: "{{ cifmw_basedir }}/artifacts" cifmw_ovirt_ssh_key_type: "{{ cifmw_ssh_keytype | default('ecdsa') }}" cifmw_ovirt_ssh_key_size: "{{ cifmw_ssh_keysize | default(521) }}" cifmw_ovirt_ssh_public_key: "" diff --git a/roles/pkg_build/defaults/main.yml b/roles/pkg_build/defaults/main.yml index 6b525ea67c..b07dfee879 100644 --- a/roles/pkg_build/defaults/main.yml +++ b/roles/pkg_build/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_pkg_build" -cifmw_pkg_build_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_pkg_build_basedir: "{{ cifmw_basedir }}" cifmw_pkg_build_ctx_name: "localhost/cifmw-buildpkgs" cifmw_pkg_build_ctx_tag: "latest" cifmw_pkg_build_ctx_push: false diff --git a/roles/polarion/defaults/main.yml b/roles/polarion/defaults/main.yml index aa685bc26e..410798a85e 100644 --- a/roles/polarion/defaults/main.yml +++ b/roles/polarion/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_polarion" -cifmw_polarion_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_polarion_basedir: "{{ cifmw_basedir }}" cifmw_polarion_jump_custom_fields: {} cifmw_polarion_jump_repo_dir: "{{ cifmw_polarion_basedir }}/polarion-jump" cifmw_polarion_jump_result_dir: "{{ cifmw_polarion_basedir }}/tests/{{ cifmw_run_test_role | default('tempest') }}/" diff --git a/roles/repo_setup/defaults/main.yml b/roles/repo_setup/defaults/main.yml index 61d4bd8ed0..5929b16e41 100644 --- a/roles/repo_setup/defaults/main.yml +++ b/roles/repo_setup/defaults/main.yml @@ -19,7 +19,7 @@ # All variables within this role should have a prefix of "cifmw_setup_repos" # To get dlrn md5 hash for components [baremetal,cinder,clients,cloudops,common, # compute,glance,manila,network,octavia,security,swift,tempest,podified,ui,validation] -cifmw_repo_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_repo_setup_basedir: "{{ cifmw_basedir }}" cifmw_repo_setup_venv: "{{ cifmw_repo_setup_basedir }}/venv/repo-setup" cifmw_repo_setup_promotion: "current-podified" cifmw_repo_setup_branch: "antelope"