diff --git a/config/ansible-lint.yml b/config/ansible-lint.yml index 5eea32934..0ed1b2fb7 100644 --- a/config/ansible-lint.yml +++ b/config/ansible-lint.yml @@ -16,20 +16,7 @@ skip_list: - 'deprecated-local-action' - 'no-free-form' - 'chema[meta]' - - 'var-naming[no-reserved]' - - 'var-naming[no-role-prefix]' - - 'var-naming[pattern]' - - 'yaml[colons]' - - 'yaml[commas]' - - 'yaml[comments]' - - 'yaml[empty-lines]' - - 'yaml[indentation]' - - 'yaml[key-duplicates]' - - 'yaml[line-length]' - - 'yaml[octal-values]' - 'yaml[truthy]' - - 'name[template]' - - 'name[casing]' - 'risky-file-permissions' - 'ignore-errors' - 'no-changed-when' diff --git a/roles/cluster/cluster_create_osd/tasks/main.yml b/roles/cluster/cluster_create_osd/tasks/main.yml index af53a4adf..5fd007686 100644 --- a/roles/cluster/cluster_create_osd/tasks/main.yml +++ b/roles/cluster/cluster_create_osd/tasks/main.yml @@ -4,7 +4,7 @@ set -o pipefail; test $(cat "{{ cluster_create_osd_kubeconfig }}" | wc -c) == 0 -- name: Ensure that the secret file '{{ cluster_create_osd_secret_file }}' exists +- name: Ensure that following secret file exists {{ cluster_create_osd_secret_file }} stat: path: "{{ cluster_create_osd_secret_file }}" diff --git a/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml b/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml index 026481868..114a9e9c4 100644 --- a/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml +++ b/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml @@ -96,7 +96,7 @@ - name: Populate the tags dict set_fact: - tags: "{{ tags | default({}) | combine({item.key: item.value}) }}" + cluster_tags: "{{ cluster_tags | default({}) | combine({item.key: item.value}) }}" with_items: - {'key': 'Name' , 'value': '{{ cluster_name_cmd.stdout }}'} - {'key': '{{ cluster_name_tag_cmd.stdout }}' , 'value': 'owned'} @@ -130,7 +130,7 @@ region: "{{ cluster_region }}" state: present name: "EFS {{ cluster_name_cmd.stdout }}" - tags: "{{ tags }}" + tags: "{{ cluster_tags }}" targets: "{{ targets }}" register: aws_efs_fs diff --git a/roles/cluster/cluster_deploy_aws_efs/tasks/ocp-efs.yaml b/roles/cluster/cluster_deploy_aws_efs/tasks/ocp-efs.yaml index 9bb01197c..a2fb1aeec 100644 --- a/roles/cluster/cluster_deploy_aws_efs/tasks/ocp-efs.yaml +++ b/roles/cluster/cluster_deploy_aws_efs/tasks/ocp-efs.yaml @@ -3,5 +3,5 @@ include_role: name: entitlement_inspect vars: - _entitlement_inspect_called_from_testwait: "yes" + entitlement_inspect_called_from_testwait: "yes" when: entitlement_inspect_on_failure == 'yes' diff --git a/roles/cluster/cluster_deploy_ldap/tasks/main.yml b/roles/cluster/cluster_deploy_ldap/tasks/main.yml index defe2ad16..ce2e5ae02 100644 --- a/roles/cluster/cluster_deploy_ldap/tasks/main.yml +++ b/roles/cluster/cluster_deploy_ldap/tasks/main.yml @@ -3,7 +3,7 @@ # content are secrets (passwords). With Python+envsubst, we're sure # that the secrets won't be printed in clear. -- name: Ensure that the secret properties file '{{ cluster_deploy_ldap_secret_properties_file }}' exists and is a file +- name: Ensure that the following secret properties path exists and it is a file {{ cluster_deploy_ldap_secret_properties_file }} stat: path: "{{ cluster_deploy_ldap_secret_properties_file }}" register: secret_props_file_stat @@ -82,7 +82,7 @@ - name: Get LDAP Bind DN command: yq .ldap.bindDN "{{ artifact_extra_logs_dir }}/oauth_ldap.yaml" - register: ldap_bindDN_cmd + register: ldap_bind_dn_cmd - name: Deploy on OCP when: not cluster_deploy_ldap_use_ocm @@ -120,7 +120,7 @@ --cluster "{{ cluster_deploy_ldap_cluster_name }}" \ --name "{{ cluster_deploy_ldap_idp_name }}" \ --url "{{ ldap_url_cmd.stdout }}" \ - --bind-dn "{{ ldap_bindDN_cmd.stdout }}" \ + --bind-dn "{{ ldap_bind_dn_cmd.stdout }}" \ --bind-password $(echo "$cluster_ldap_adminpassword") \ --insecure @@ -137,7 +137,7 @@ --cluster "{{ cluster_deploy_ldap_cluster_name }}" \ --name "{{ cluster_deploy_ldap_idp_name }}" \ --url "{{ ldap_url_cmd.stdout }}" \ - --bind-dn "{{ ldap_bindDN_cmd.stdout }}" \ + --bind-dn "{{ ldap_bind_dn_cmd.stdout }}" \ --bind-password $(echo "$cluster_ldap_adminpassword") # need to add --insecure here, when available in `ocm`. diff --git a/roles/cluster/cluster_deploy_nginx_server/tasks/main.yml b/roles/cluster/cluster_deploy_nginx_server/tasks/main.yml index 5ac155d1b..edb99055e 100644 --- a/roles/cluster/cluster_deploy_nginx_server/tasks/main.yml +++ b/roles/cluster/cluster_deploy_nginx_server/tasks/main.yml @@ -12,7 +12,7 @@ path: "{{ cluster_deploy_nginx_server_directory }}" register: directory_stats -- name: Fail if {{ cluster_deploy_nginx_server_directory }} is not a directory +- name: Fail if the following path is not a directory {{ cluster_deploy_nginx_server_directory }} fail: msg="'{{ cluster_deploy_nginx_server_directory }}' isn't a reachable directory." when: not directory_stats.stat.exists or not directory_stats.stat.isdir diff --git a/roles/cluster/cluster_ensure_machineset/tasks/derive_machineset.yml b/roles/cluster/cluster_ensure_machineset/tasks/derive_machineset.yml index 6a9dd9dd8..bea56572b 100644 --- a/roles/cluster/cluster_ensure_machineset/tasks/derive_machineset.yml +++ b/roles/cluster/cluster_ensure_machineset/tasks/derive_machineset.yml @@ -26,7 +26,7 @@ -o json > {{ artifact_extra_logs_dir }}/source_machineset.json -- name: Update the MachineSet with the requested instance type ({{ machineset_instance_type }}) and store in a file +- name: Update and store in a file the MachineSet with the requested instance type {{ machineset_instance_type }} shell: "{{ reconfigure_machineset }} {{ artifact_extra_logs_dir }}/source_machineset.json @@ -35,7 +35,7 @@ {{ machineset_taint }} > {{ artifact_extra_logs_dir }}/new_machineset.json" -- name: Update the MachineSet {% if cluster_ensure_machineset_spot %}with{% else %}without{% endif %} the Spot instance flag +- name: Update the MachineSet spotMarketOptions spec to be {% if cluster_ensure_machineset_spot %}added{% else %}deleted{% endif %} shell: set -o pipefail; diff --git a/roles/cluster/cluster_ensure_machineset/tasks/main.yml b/roles/cluster/cluster_ensure_machineset/tasks/main.yml index 05174434a..73003785a 100644 --- a/roles/cluster/cluster_ensure_machineset/tasks/main.yml +++ b/roles/cluster/cluster_ensure_machineset/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: "Check if the cluster already has a {{ machineset_instance_type }} machineset" +- name: Check if the cluster already has a machineset of type {{ machineset_instance_type }} shell: set -o pipefail; oc get machineset -n openshift-machine-api diff --git a/roles/cluster/cluster_preload_image/tasks/main.yml b/roles/cluster/cluster_preload_image/tasks/main.yml index 91771c7f2..e917f62a5 100644 --- a/roles/cluster/cluster_preload_image/tasks/main.yml +++ b/roles/cluster/cluster_preload_image/tasks/main.yml @@ -41,10 +41,10 @@ oc get ds/{{ cluster_preload_image_name }} '-ojsonpath={.status.desiredNumberScheduled}' -n {{ cluster_preload_image_namespace }} - register: desiredNumberScheduled_cmd + register: desired_number_scheduled_cmd retries: 3 delay: 15 - until: desiredNumberScheduled_cmd or "0" | int > 0 + until: desired_number_scheduled_cmd or "0" | int > 0 - name: Wait for the pods to be scheduled shell: @@ -53,10 +53,10 @@ -ojson -n {{ cluster_preload_image_namespace }} | jq '.status.desiredNumberScheduled - .status.currentNumberScheduled' - register: currentNumberNotScheduled_cmd + register: current_number_not_scheduled_cmd retries: 3 delay: 15 - until: currentNumberNotScheduled_cmd.stdout | int == 0 + until: current_number_not_scheduled_cmd.stdout | int == 0 - name: Wait for the pods to be ready shell: @@ -65,21 +65,21 @@ -ojson -n {{ cluster_preload_image_namespace }} | jq '.status.desiredNumberScheduled - .status.numberReady' - register: currentNumberNotReady_cmd + register: current_number_not_ready_cmd retries: 20 delay: 30 - until: currentNumberNotReady_cmd.stdout | int == 0 + until: current_number_not_ready_cmd.stdout | int == 0 - name: Get the final desired number command: oc get ds/{{ cluster_preload_image_name }} '-ojsonpath={.status.desiredNumberScheduled}' -n {{ cluster_preload_image_namespace }} - register: finalDesiredNumberScheduled_cmd + register: final_desired_number_scheduled_cmd - name: Fail if the image has been preloaded on 0 nodes fail: msg="The node selector '{{ cluster_preload_image_node_selector_key }}={{ cluster_preload_image_node_selector_value }}' did not match any node" - when: finalDesiredNumberScheduled_cmd.stdout | int == 0 + when: final_desired_number_scheduled_cmd.stdout | int == 0 always: - name: Get the description of the preload Pods diff --git a/roles/cluster/cluster_set_scale/tasks/main.yml b/roles/cluster/cluster_set_scale/tasks/main.yml index 5302f0f3e..3f1f68332 100644 --- a/roles/cluster/cluster_set_scale/tasks/main.yml +++ b/roles/cluster/cluster_set_scale/tasks/main.yml @@ -48,12 +48,12 @@ register: oc_get_machinesets failed_when: not oc_get_machinesets.stdout -- name: Change all {{ machineset_instance_type }} machinesets replicas to have sum {{ scale }} +- name: Change all {{ machineset_instance_type + 'machinesets replicas to have sum' + scale }} when: current_replicas_sum != scale block: - name: Do not downscale any machinesets other than the first one, unless the user used force block: - - name: Calculate sum of replicas of machinesets with type {{ machineset_instance_type }}, except for the first one + - name: Calculate except for the first one, the sum of replicas of machinesets with type {{ machineset_instance_type }} set_fact: current_replicas_sum_non_first: "{{ machineset_replicas.stdout_lines[1:] | map('int') | sum(start=0) }}" @@ -66,7 +66,7 @@ - name: End play fail: msg="Missing force flag" - - name: Set the replicas of all {{ machineset_instance_type }} machinesets to 0 except the first + - name: Set the replicas of all machinesets to 0 except the first for {{ machineset_instance_type }} command: | oc patch machineset -n openshift-machine-api {{ item }} --patch '{"spec": {"replicas": 0 }}' --type merge loop: "{{ oc_get_machinesets.stdout_lines[1:] }}" @@ -75,14 +75,14 @@ set_fact: first_machineset: "{{ oc_get_machinesets.stdout_lines[0] }}" - - name: Set the replicas of the first {{ machineset_instance_type }} machineset ({{ first_machineset }}) to {{ scale }} + - name: Set the replicas of the first {{ machineset_instance_type + 'machineset (' + first_machineset + ') to ' + scale }} command: > oc patch machineset -n openshift-machine-api {{ first_machineset }} --patch '{"spec": {"replicas": {{ scale }} }}' --type merge - name: Make sure the machinesets are ready block: - - name: Wait for all machinesets with type {{ machineset_instance_type }} to be ready + - name: Wait for readiness for all machinesets with type {{ machineset_instance_type }} # This is done by verifying that at the availableReplicas # jq purpose, respectively: diff --git a/roles/entitlement/entitlement_deploy/tasks/main.yml b/roles/entitlement/entitlement_deploy/tasks/main.yml index 297299d99..0a2dc756c 100644 --- a/roles/entitlement/entitlement_deploy/tasks/main.yml +++ b/roles/entitlement/entitlement_deploy/tasks/main.yml @@ -1,11 +1,11 @@ --- -- name: "Ensure that the entitlement file 'entitlement_pem={{ entitlement_pem }}' exists" +- name: Ensure that the entitlement file exists entitlement_pem={{ entitlement_pem }} stat: path: '{{ entitlement_pem }}' register: entitlement_pem_stat failed_when: not entitlement_pem_stat.stat.exists -- name: "Ensure that the entitlement RHSM file 'entitlement_rhsm={{ entitlement_rhsm }}' exists" +- name: Ensure that the entitlement RHSM file exists entitlement_rhsm={{ entitlement_rhsm }} stat: path: '{{ entitlement_rhsm }}' register: entitlement_rhsm_stat @@ -28,7 +28,7 @@ set_fact: machine_config_role: worker -- name: "Deploy RHSM from file '{{ entitlement_rhsm }}'" +- name: Deploy RHSM from file {{ entitlement_rhsm }} shell: set -o pipefail; cat "{{ entitlement_mc_rhsm }}" @@ -36,7 +36,7 @@ | python3 "{{ entitlement_py_apply }}" MACHINE_CONFIG_ROLE "{{ machine_config_role }}" | oc apply -f- -- name: "Deploy the pem and key-pem from file '{{ entitlement_pem }}'" +- name: Deploy the pem and key-pem from file {{ entitlement_pem }} shell: set -o pipefail; cat "{{ entitlement_mc_pem }}" @@ -44,7 +44,7 @@ | python3 "{{ entitlement_py_apply }}" MACHINE_CONFIG_ROLE "{{ machine_config_role }}" | oc apply -f- -- name: "Deploy the repo CA from file '{{ entitlement_mc_rhsm_ca }}' if requested" +- name: If requested deploy the repo CA from file {{ entitlement_mc_rhsm_ca }} when: entitlement_repo_ca | default('', true) | trim != '' block: - name: Compute the md5sum of the CA file (debug) diff --git a/roles/entitlement/entitlement_inspect/tasks/main.yml b/roles/entitlement/entitlement_inspect/tasks/main.yml index fc2ad027d..5c929cfbe 100644 --- a/roles/entitlement/entitlement_inspect/tasks/main.yml +++ b/roles/entitlement/entitlement_inspect/tasks/main.yml @@ -2,7 +2,7 @@ - name: Run the entitlement test taskbook include_role: name: entitlement_test_wait_deployment - when: _entitlement_inspect_called_from_testwait == "no" + when: entitlement_inspect_called_from_testwait == "no" - name: List entitlement MachineConfig objects command: oc get MachineConfig 50-entitlement-key-pem 50-entitlement-pem 50-rhsm-conf diff --git a/roles/entitlement/entitlement_inspect/vars/main/internal_config.yml b/roles/entitlement/entitlement_inspect/vars/main/internal_config.yml index bf74a5868..789dff93c 100644 --- a/roles/entitlement/entitlement_inspect/vars/main/internal_config.yml +++ b/roles/entitlement/entitlement_inspect/vars/main/internal_config.yml @@ -1,2 +1,2 @@ --- -_entitlement_inspect_called_from_testwait: "no" +entitlement_inspect_called_from_testwait: "no" diff --git a/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml b/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml index fd931988e..208e11bb9 100644 --- a/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml +++ b/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml @@ -1,11 +1,11 @@ --- -- name: "Ensure that the entitlement file 'entitlement_pem={{ entitlement_pem }}' exists" +- name: Ensure that the entitlement file exists entitlement_pem={{ entitlement_pem }} stat: path: '{{ entitlement_pem }}' register: entitlement_pem_stat failed_when: not entitlement_pem_stat.stat.exists -- name: "Ensure that the entitlement RHSM file 'entitlement_rhsm={{ entitlement_rhsm }}' exists" +- name: Ensure that the entitlement RHSM file exists entitlement_rhsm={{ entitlement_rhsm }} stat: path: '{{ entitlement_rhsm }}' register: entitlement_rhsm_stat diff --git a/roles/entitlement/entitlement_test_in_podman/tasks/main.yml b/roles/entitlement/entitlement_test_in_podman/tasks/main.yml index c247c2ab0..891decb14 100644 --- a/roles/entitlement/entitlement_test_in_podman/tasks/main.yml +++ b/roles/entitlement/entitlement_test_in_podman/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: "Ensure that the entitlement file 'entitlement_pem={{ entitlement_pem }}' exists" +- name: Ensure that the entitlement file exists entitlement_pem={{ entitlement_pem }} stat: path: '{{ entitlement_pem }}' register: entitlement_pem_stat diff --git a/roles/entitlement/entitlement_test_wait_deployment/tasks/main.yml b/roles/entitlement/entitlement_test_wait_deployment/tasks/main.yml index 083d958a1..f5dbfb8c1 100644 --- a/roles/entitlement/entitlement_test_wait_deployment/tasks/main.yml +++ b/roles/entitlement/entitlement_test_wait_deployment/tasks/main.yml @@ -1,10 +1,10 @@ --- -- name: "Set the number of retry loop to 0 as waiting not requested" +- name: Set the number of retry loop to 0 as waiting not requested set_fact: entitlement_retries: 0 when: entitlement_test_and_wait != 'yes' -- name: "Set the number of retry loop to {{ entitlement_nb_wait_retries }} as waiting is requested" +- name: As waiting is requested set the number of retry loop to {{ entitlement_nb_wait_retries }} set_fact: entitlement_retries: "{{ entitlement_nb_wait_retries }}" when: entitlement_test_and_wait == 'yes' @@ -53,7 +53,7 @@ include_role: name: entitlement_inspect vars: - _entitlement_inspect_called_from_testwait: "yes" + entitlement_inspect_called_from_testwait: "yes" when: entitlement_inspect_on_failure == 'yes' - name: Store the description of the test Pod (debug) diff --git a/roles/gpu_operator/gpu_operator_capture_deployment_state/tasks/main.yml b/roles/gpu_operator/gpu_operator_capture_deployment_state/tasks/main.yml index 95f8e6728..2ebd255a4 100644 --- a/roles/gpu_operator/gpu_operator_capture_deployment_state/tasks/main.yml +++ b/roles/gpu_operator/gpu_operator_capture_deployment_state/tasks/main.yml @@ -12,28 +12,28 @@ # --- -- name: "Get the GPU Operator Pod in {{ gpu_operator_operator_namespace }} (list)" +- name: Get the GPU Operator Pod as a list from {{ gpu_operator_operator_namespace }} shell: oc get pods -lapp=gpu-operator -n {{ gpu_operator_operator_namespace }} -owide > {{ artifact_extra_logs_dir }}/gpu_operator_pod.list failed_when: false -- name: "Get the GPU Operator Pod in {{ gpu_operator_operator_namespace }} (yaml)" +- name: Get the GPU Operator Pod as yaml from {{ gpu_operator_operator_namespace }} shell: oc get pods -lapp=gpu-operator -n {{ gpu_operator_operator_namespace }} -oyaml > {{ artifact_extra_logs_dir }}/gpu_operator_pod.yaml failed_when: false -- name: "Get the Pods in {{ gpu_operator_namespace }} (list)" +- name: Get the Pods as a list from {{ gpu_operator_namespace }} shell: oc get pods -owide -n {{ gpu_operator_namespace }} > {{ artifact_extra_logs_dir }}/all_gpu_pods.list failed_when: false -- name: "Get the Pods in {{ gpu_operator_namespace }} (yaml)" +- name: Get the Pods as yaml from {{ gpu_operator_namespace }} shell: oc get pods -oyaml -n {{ gpu_operator_namespace }} @@ -52,14 +52,14 @@ done failed_when: false -- name: "Get the DaemonSets in {{ gpu_operator_namespace }} (list)" +- name: Get the following DaemonSets as a list from {{ gpu_operator_namespace }} shell: oc get ds -n {{ gpu_operator_namespace }} > {{ artifact_extra_logs_dir }}/all_gpu_ds.list failed_when: false -- name: "Get the DaemonSets in {{ gpu_operator_namespace }} (yaml)" +- name: Get the following DaemonSets in yaml from {{ gpu_operator_namespace }} shell: oc get ds -oyaml -n {{ gpu_operator_namespace }} diff --git a/roles/gpu_operator/gpu_operator_get_csv_version/tasks/main.yml b/roles/gpu_operator/gpu_operator_get_csv_version/tasks/main.yml index 4aa2d8154..c2cd48b4a 100644 --- a/roles/gpu_operator/gpu_operator_get_csv_version/tasks/main.yml +++ b/roles/gpu_operator/gpu_operator_get_csv_version/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Get the operator version block: - - name: check if env is available + - name: Check if env is available shell: echo "$GPU_OPERATOR_VERSION" register: gpu_operator_csv_version_cmd failed_when: gpu_operator_csv_version_cmd.stdout | length == 0 @@ -36,10 +36,10 @@ register: gpu_operator_csv_version_cmd failed_when: gpu_operator_csv_version_cmd.stdout | length == 0 -- name: Store the version '{{ gpu_operator_csv_version_cmd.stdout }}' as an ansible variable +- name: Store the version as an ansible variable '{{ gpu_operator_csv_version_cmd.stdout }}' set_fact: gpu_operator_version: '{{ gpu_operator_csv_version_cmd.stdout }}' -- name: Store the veersion '{{ gpu_operator_csv_version_cmd.stdout }}' as an artifacts file +- name: Store the version as an artifacts file '{{ gpu_operator_csv_version_cmd.stdout }}' shell: echo '{{ gpu_operator_version }}' > {{ artifact_extra_logs_dir }}/gpu_operator.version diff --git a/roles/nfd/nfd_test_wait_gpu/tasks/main.yml b/roles/nfd/nfd_test_wait_gpu/tasks/main.yml index 4a03ff750..6c32bcfaa 100644 --- a/roles/nfd/nfd_test_wait_gpu/tasks/main.yml +++ b/roles/nfd/nfd_test_wait_gpu/tasks/main.yml @@ -4,7 +4,7 @@ nfd_wait_gpu_retries: 0 when: nfd_wait_gpu_nodes != 'yes' -- name: "Set the number of retry loop to {{ nfd_wait_gpu_nb_retries }} if waiting is requested" +- name: Set the number of retry loop if waiting is requested to {{ nfd_wait_gpu_nb_retries }} set_fact: nfd_wait_gpu_retries: "{{ nfd_wait_gpu_nb_retries }}" when: nfd_wait_gpu_nodes == 'yes' diff --git a/roles/ocm/ocm_deploy_addon/tasks/main.yml b/roles/ocm/ocm_deploy_addon/tasks/main.yml index 94d7b674c..fa8374ee7 100644 --- a/roles/ocm/ocm_deploy_addon/tasks/main.yml +++ b/roles/ocm/ocm_deploy_addon/tasks/main.yml @@ -36,7 +36,7 @@ mode: 0400 when: '"Error" in ocm_addon_precheck.stdout' -- name: Install addon {{ ocm_deploy_addon_id }} via OCM API +- name: Install the following addon via OCM API {{ ocm_deploy_addon_id }} shell: | set -o pipefail; url="/api/clusters_mgmt/v1/clusters/{{ cluster_id }}/addons" diff --git a/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml b/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml index dbbdb87f8..f24046582 100644 --- a/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml +++ b/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml @@ -4,13 +4,13 @@ fail: msg="Bailing out. This role requires 'pipelines_run_kfp_notebook_notebook_directory'" when: not pipelines_run_kfp_notebook_notebook_directory -- name: Ensure that {{ pipelines_run_kfp_notebook_notebook_directory }} is a directory +- name: Ensure that the following path is a directory {{ pipelines_run_kfp_notebook_notebook_directory }} stat: path: "{{ pipelines_run_kfp_notebook_notebook_directory }}" register: directory_stats failed_when: not directory_stats.stat.exists or not directory_stats.stat.isdir -- name: Ensure that {{ pipelines_run_kfp_notebook_notebook_directory }}/{{ pipelines_run_kfp_notebook_notebook_filename }} is a file +- name: Ensure that the following path is a file {{ pipelines_run_kfp_notebook_notebook_directory + '/' + pipelines_run_kfp_notebook_notebook_filename }} stat: path: "{{ pipelines_run_kfp_notebook_notebook_directory }}/{{ pipelines_run_kfp_notebook_notebook_filename }}" register: file_stats @@ -21,7 +21,7 @@ path: "{{ pipelines_run_kfp_notebook_notebook_directory }}" register: directory_stats -- name: Fail if {{ pipelines_run_kfp_notebook_notebook_directory }} is not a directory +- name: Fail if the following path is not a directory {{ pipelines_run_kfp_notebook_notebook_directory }} fail: msg="'{{ pipelines_run_kfp_notebook_notebook_directory }}' isn't a reachable directory." when: not directory_stats.stat.exists or not directory_stats.stat.isdir diff --git a/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml b/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml index 50c783d74..d9f66cd60 100644 --- a/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml +++ b/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml @@ -9,7 +9,7 @@ path: "{{ rhods_benchmark_notebook_performance_notebook_directory }}" register: directory_stats -- name: Fail if {{ rhods_benchmark_notebook_performance_notebook_directory }} is not a directory +- name: Fail if the following dir is not a directory {{ rhods_benchmark_notebook_performance_notebook_directory }} fail: msg="'{{ rhods_benchmark_notebook_performance_notebook_directory }}' isn't a reachable directory." when: not directory_stats.stat.exists or not directory_stats.stat.isdir diff --git a/roles/rhods/rhods_capture_state/tasks/main.yml b/roles/rhods/rhods_capture_state/tasks/main.yml index 3df339bcc..4eaa666e9 100644 --- a/roles/rhods/rhods_capture_state/tasks/main.yml +++ b/roles/rhods/rhods_capture_state/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Capture the content of the {{ namespace }} namespace +- name: Capture the content of the namespace {{ namespace }} include_tasks: capture_namespace.yml loop: - redhat-ods-monitoring diff --git a/roles/rhods/rhods_delete_ods/tasks/main.yml b/roles/rhods/rhods_delete_ods/tasks/main.yml index 847844bcf..a9886198f 100644 --- a/roles/rhods/rhods_delete_ods/tasks/main.yml +++ b/roles/rhods/rhods_delete_ods/tasks/main.yml @@ -62,7 +62,7 @@ oc delete ns "{{ rhods_delete_ods_namespace }}" --ignore-not-found -- name: Delete all the {{ item }} CRDs +- name: Delete all the following CRDs {{ item }} shell: | set -o pipefail; CRDs=$(oc get crd -oname | grep {{ item }}) diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest_project.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest_project.yml index 3f35474ac..74b929b09 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest_project.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest_project.yml @@ -8,7 +8,7 @@ register: has_notebooks_crd failed_when: false -- name: Count the notebooks in the {{ rhods_notebook_namespace }} namespace +- name: Count the notebooks in the namespace {{ rhods_notebook_namespace }} environment: KUBECONFIG: '{{ sut_cluster_kubeconfig }}' shell: @@ -32,12 +32,12 @@ register: dsg_namespaces_pod_count_cmd -- name: Capture the artifacts of the {{ rhods_notebook_namespace }} sutest project +- name: Capture the artifacts of the sutest project {{ rhods_notebook_namespace }} when: notebook_namespace_pod_count_cmd.stdout != "0" environment: KUBECONFIG: '{{ sut_cluster_kubeconfig }}' block: - - name: Create the sutest {{ rhods_notebook_namespace }} artifacts directory + - name: Create the sutest artifacts directory {{ rhods_notebook_namespace }} file: path: "{{ project_artifacts_dir }}" state: directory