diff --git a/config/ansible-lint.yml b/config/ansible-lint.yml index 0ed1b2fb71..e62a5cab49 100644 --- a/config/ansible-lint.yml +++ b/config/ansible-lint.yml @@ -1,7 +1,11 @@ +exclude_paths: + - .github + skip_list: # Hide "wrong indentation: expected 4 but found 2 (indentation)" # until we find out how to properly configure it - - 'yaml' + - 'yaml[indentation]' + - 'yaml[line-length]' # Do not force galaxy info in meta/main.yml - 'meta-no-info' # Hide "Commands should not change things if nothing needs doing" @@ -16,8 +20,5 @@ skip_list: - 'deprecated-local-action' - 'no-free-form' - 'chema[meta]' - - 'yaml[truthy]' - - 'risky-file-permissions' - 'ignore-errors' - - 'no-changed-when' - 'fqcn' diff --git a/roles/benchmarking/benchmarking_deploy_coco_dataset/defaults/main/config.yml b/roles/benchmarking/benchmarking_deploy_coco_dataset/defaults/main/config.yml index d2c1be7f52..5ba520d694 100644 --- a/roles/benchmarking/benchmarking_deploy_coco_dataset/defaults/main/config.yml +++ b/roles/benchmarking/benchmarking_deploy_coco_dataset/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Benchmarking.download_coco_dataset +# Parameters # Hostname of the node where the download pod will be executed. # Mandatory value benchmarking_deploy_coco_dataset_node_hostname: @@ -17,4 +18,3 @@ benchmarking_deploy_coco_dataset_storage_dir: /storage # Path to credentials to use for accessing the dataset s3 bucket. benchmarking_deploy_coco_dataset_s3_cred: - diff --git a/roles/benchmarking/benchmarking_deploy_coco_dataset/tasks/main.yml b/roles/benchmarking/benchmarking_deploy_coco_dataset/tasks/main.yml index 259f73fb9a..6b52e5dfa3 100644 --- a/roles/benchmarking/benchmarking_deploy_coco_dataset/tasks/main.yml +++ b/roles/benchmarking/benchmarking_deploy_coco_dataset/tasks/main.yml @@ -36,7 +36,7 @@ template: src: "{{ coco_dataset_pvc }}" dest: "{{ artifact_extra_logs_dir }}/001_pvc_coco-dataset.yml" - mode: 0400 + mode: '0400' - name: Check if the PVC already exists command: oc get -f "{{ artifact_extra_logs_dir }}/001_pvc_coco-dataset.yml" -oname @@ -52,7 +52,7 @@ template: src: "{{ coco_dataset_pod }}" dest: "{{ artifact_extra_logs_dir }}/002_pod_coco-dataset.yml" - mode: 0400 + mode: '0400' - name: Delete the Pod, if it exists command: diff --git a/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/config.yml b/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/config.yml index c0a9a450b4..1ee63a1e39 100644 --- a/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/config.yml +++ b/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Benchmarking.run_mlperf_ssd +# Parameters # Hostname of the node where the ssd benchmark will be executed. # Mandatory value benchmarking_run_mlperf_ssd_node_hostname: @@ -19,4 +20,3 @@ benchmarking_run_mlperf_ssd_epochs: # Benchmark threshold target value. # Type: Float benchmarking_run_mlperf_ssd_threshold: - diff --git a/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/preset.yaml b/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/preset.yaml index b7598702cd..1875150b34 100644 --- a/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/preset.yaml +++ b/roles/benchmarking/benchmarking_run_mlperf_ssd/defaults/main/preset.yaml @@ -5,4 +5,4 @@ benchmarking_run_mlperf_ssd_dataset_pvc_name: "benchmarking-coco-dataset" benchmarking_run_mlperf_ssd_entrypoint_cm_name: "benchmarking-mlperf-ssd-entrypoint" # name of the pod running the SSD benchmark -benchmarking_run_mlperf_ssd_name: "benchmarking-mlperf-ssd" \ No newline at end of file +benchmarking_run_mlperf_ssd_name: "benchmarking-mlperf-ssd" diff --git a/roles/benchmarking/benchmarking_run_mlperf_ssd/tasks/main.yml b/roles/benchmarking/benchmarking_run_mlperf_ssd/tasks/main.yml index 1b12434c95..2d73d25543 100644 --- a/roles/benchmarking/benchmarking_run_mlperf_ssd/tasks/main.yml +++ b/roles/benchmarking/benchmarking_run_mlperf_ssd/tasks/main.yml @@ -34,7 +34,7 @@ template: src: "{{ benchmarking_mlperf_ssd_pod }}" dest: "{{ artifact_extra_logs_dir }}/001_pod_run-mlperf-ssd.yml" - mode: 0400 + mode: '0400' - name: Delete the Pod, if it exists command: diff --git a/roles/cluster/cluster_capture_environment/defaults/main/config.yml b/roles/cluster/cluster_capture_environment/defaults/main/config.yml index d03c3fd837..e9e65bff00 100644 --- a/roles/cluster/cluster_capture_environment/defaults/main/config.yml +++ b/roles/cluster/cluster_capture_environment/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.capture_environment - diff --git a/roles/cluster/cluster_capture_environment/tasks/main.yml b/roles/cluster/cluster_capture_environment/tasks/main.yml index d0006390fe..93c253c301 100644 --- a/roles/cluster/cluster_capture_environment/tasks/main.yml +++ b/roles/cluster/cluster_capture_environment/tasks/main.yml @@ -42,7 +42,7 @@ copy: content: "{{ git_version.stdout }}" dest: "{{ artifact_extra_logs_dir }}/ci_artifact.git_version" - mode: 0644 + mode: '0644' - name: Fetch ci-artifact last git commit command: @@ -53,7 +53,7 @@ copy: content: "{{ git_show.stdout }}" dest: "{{ artifact_extra_logs_dir }}/ci_artifact.git_commit" - mode: 0644 + mode: '0644' - name: Get the cluster nodes status shell: diff --git a/roles/cluster/cluster_create_htpasswd_user/defaults/main/config.yml b/roles/cluster/cluster_create_htpasswd_user/defaults/main/config.yml index cf0502d48c..bbbb76e460 100644 --- a/roles/cluster/cluster_create_htpasswd_user/defaults/main/config.yml +++ b/roles/cluster/cluster_create_htpasswd_user/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.create_htpasswd_adminuser +# Parameters # Username of the htpasswd user. # Mandatory value cluster_create_htpasswd_user_username: @@ -13,6 +14,7 @@ cluster_create_htpasswd_user_passwordfile: # If True, waits for the user to be able to login into the cluster. cluster_create_htpasswd_user_wait: false +# Constants # Name of the secret that will contain the htpasswd passwords # Defined as a constant in Cluster.create_htpasswd_adminuser cluster_create_htpasswd_user_secret_name: htpasswd-secret @@ -28,4 +30,3 @@ cluster_create_htpasswd_user_role: cluster-admin # Name of the group that will be created for the user # Defined as a constant in Cluster.create_htpasswd_adminuser cluster_create_htpasswd_user_groupname: local-admins - diff --git a/roles/cluster/cluster_create_htpasswd_user/tasks/main.yml b/roles/cluster/cluster_create_htpasswd_user/tasks/main.yml index 5b6e392989..a21a58ba32 100644 --- a/roles/cluster/cluster_create_htpasswd_user/tasks/main.yml +++ b/roles/cluster/cluster_create_htpasswd_user/tasks/main.yml @@ -33,7 +33,7 @@ template: src: "{{ cluster_create_htpasswd_user_oauth }}" dest: "{{ artifact_extra_logs_dir }}/oauth_htpasswd.yaml" - mode: 0400 + mode: '0400' - name: Append the htpasswd OAuth identity provider shell: @@ -74,6 +74,7 @@ ansible.builtin.file: path: /tmp/user_kubeconfig state: touch + mode: '0644' - name: Wait for the authentication to work when: cluster_create_htpasswd_user_wait | bool diff --git a/roles/cluster/cluster_create_htpasswd_user/vars/main/resources.yml b/roles/cluster/cluster_create_htpasswd_user/vars/main/resources.yml index 3adcf311b2..12003b9f06 100644 --- a/roles/cluster/cluster_create_htpasswd_user/vars/main/resources.yml +++ b/roles/cluster/cluster_create_htpasswd_user/vars/main/resources.yml @@ -1,2 +1,2 @@ --- -cluster_create_htpasswd_user_oauth: "roles/cluster/cluster_create_htpasswd_user/templates/oauth.yml.j2" \ No newline at end of file +cluster_create_htpasswd_user_oauth: "roles/cluster/cluster_create_htpasswd_user/templates/oauth.yml.j2" diff --git a/roles/cluster/cluster_create_osd/defaults/main/config.yml b/roles/cluster/cluster_create_osd/defaults/main/config.yml index cd0b053dc3..6a174fe28f 100644 --- a/roles/cluster/cluster_create_osd/defaults/main/config.yml +++ b/roles/cluster/cluster_create_osd/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.create_osd +# Parameters # The name to give to the cluster. # Mandatory value cluster_create_osd_cluster_name: @@ -30,6 +31,7 @@ cluster_create_osd_compute_machine_type: m5.xlarge # Type: Int cluster_create_osd_compute_nodes: 2 +# Constants # Name of the worker node machinepool # Defined as a constant in Cluster.create_osd cluster_create_osd_machinepool_name: default @@ -41,4 +43,3 @@ cluster_create_osd_kubeadmin_group: cluster-admins # Name of the admin account that will be created. # Defined as a constant in Cluster.create_osd cluster_create_osd_kubeadmin_name: kubeadmin - diff --git a/roles/cluster/cluster_deploy_aws_efs/defaults/main/config.yml b/roles/cluster/cluster_deploy_aws_efs/defaults/main/config.yml index 44d9148a21..7df9052bc6 100644 --- a/roles/cluster/cluster_deploy_aws_efs/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_aws_efs/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_aws_efs - 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 114a9e9c46..9870221e2f 100644 --- a/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml +++ b/roles/cluster/cluster_deploy_aws_efs/tasks/aws-efs.yaml @@ -98,8 +98,8 @@ set_fact: 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'} + - {'key': 'Name', 'value': '{{ cluster_name_cmd.stdout }}'} + - {'key': '{{ cluster_name_tag_cmd.stdout }}', 'value': 'owned'} - {'key': 'Purpose', 'value': ''} - name: Get the SecurityGroup content diff --git a/roles/cluster/cluster_deploy_aws_efs/tasks/main.yml b/roles/cluster/cluster_deploy_aws_efs/tasks/main.yml index b637515805..f15315b124 100644 --- a/roles/cluster/cluster_deploy_aws_efs/tasks/main.yml +++ b/roles/cluster/cluster_deploy_aws_efs/tasks/main.yml @@ -26,7 +26,7 @@ template: src: "{{ cluster_deploy_aws_efs_csi_driver }}" dest: "{{ artifact_extra_logs_dir }}/csi-driver.yml" - mode: 0400 + mode: '0400' - name: Create the ClusterCSIDriver resource command: oc apply -f "{{ artifact_extra_logs_dir }}/csi-driver.yml" @@ -35,7 +35,7 @@ template: src: "{{ cluster_deploy_aws_efs_storage_class }}" dest: "{{ artifact_extra_logs_dir }}/storage-class.yml" - mode: 0400 + mode: '0400' - name: Create the StorageClass resource command: oc apply -f "{{ artifact_extra_logs_dir }}/storage-class.yml" diff --git a/roles/cluster/cluster_deploy_kepler/defaults/main/config.yml b/roles/cluster/cluster_deploy_kepler/defaults/main/config.yml index d8a2573d1d..55ef78a12c 100644 --- a/roles/cluster/cluster_deploy_kepler/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_kepler/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_kepler - diff --git a/roles/cluster/cluster_deploy_kepler/tasks/main.yml b/roles/cluster/cluster_deploy_kepler/tasks/main.yml index 94f5effab5..07db720753 100644 --- a/roles/cluster/cluster_deploy_kepler/tasks/main.yml +++ b/roles/cluster/cluster_deploy_kepler/tasks/main.yml @@ -16,7 +16,7 @@ git --git-dir "{{ kepler_location }}/.git" show - name: Deploy kepler-operator - shell: + shell: cd "{{ kepler_location }}"; make deploy OPERATOR_IMG=quay.io/sustainable_computing_io/kepler-operator:latest register: deploy_kepler delay: 3 diff --git a/roles/cluster/cluster_deploy_ldap/defaults/main/config.yml b/roles/cluster/cluster_deploy_ldap/defaults/main/config.yml index 186d675b8f..df63d079eb 100644 --- a/roles/cluster/cluster_deploy_ldap/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_ldap/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_ldap +# Parameters # Name of the LDAP identity provider. # Mandatory value cluster_deploy_ldap_idp_name: @@ -31,7 +32,7 @@ cluster_deploy_ldap_cluster_name: null # If True, waits for the first user (0) to be able to login into the cluster. cluster_deploy_ldap_wait: false +# Constants # Name of the admin user # Defined as a constant in Cluster.deploy_ldap cluster_deploy_ldap_admin_user: admin - diff --git a/roles/cluster/cluster_deploy_ldap/tasks/main.yml b/roles/cluster/cluster_deploy_ldap/tasks/main.yml index ce2e5ae025..0c74a987b9 100644 --- a/roles/cluster/cluster_deploy_ldap/tasks/main.yml +++ b/roles/cluster/cluster_deploy_ldap/tasks/main.yml @@ -72,7 +72,7 @@ template: src: "{{ cluster_deploy_ldap_oauth }}" dest: "{{ artifact_extra_logs_dir }}/oauth_ldap.yaml" - mode: 0400 + mode: '0400' - name: Get LDAP URL command: @@ -168,6 +168,7 @@ ansible.builtin.file: path: /tmp/user_kubeconfig state: touch + mode: '0644' - name: Wait for the authentication to work when: cluster_deploy_ldap_wait | bool diff --git a/roles/cluster/cluster_deploy_minio_s3_server/defaults/main/config.yml b/roles/cluster/cluster_deploy_minio_s3_server/defaults/main/config.yml index f71c19a053..3529647023 100644 --- a/roles/cluster/cluster_deploy_minio_s3_server/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_minio_s3_server/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_minio_s3_server +# Parameters # Path of a file containing the properties of S3 secrets. # Mandatory value cluster_deploy_minio_s3_server_secret_properties_file: @@ -12,6 +13,7 @@ cluster_deploy_minio_s3_server_namespace: minio # The name of the default bucket to create in Minio. cluster_deploy_minio_s3_server_bucket_name: myBucket +# Constants # Name of the Minio admin user # Defined as a constant in Cluster.deploy_minio_s3_server cluster_deploy_minio_s3_server_root_user: admin @@ -19,4 +21,3 @@ cluster_deploy_minio_s3_server_root_user: admin # Name of the user/access key to use to connect to the Minio server # Defined as a constant in Cluster.deploy_minio_s3_server cluster_deploy_minio_s3_server_access_key: minio - diff --git a/roles/cluster/cluster_deploy_nfs_provisioner/defaults/main/config.yml b/roles/cluster/cluster_deploy_nfs_provisioner/defaults/main/config.yml index 484fb0fd3a..05987f391b 100644 --- a/roles/cluster/cluster_deploy_nfs_provisioner/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_nfs_provisioner/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_nfs_provisioner +# Parameters # The namespace where the resources will be deployed cluster_deploy_nfs_provisioner_namespace: nfs-provisioner @@ -16,4 +17,3 @@ cluster_deploy_nfs_provisioner_storage_class_name: nfs-provisioner # Set to true to mark the storage class as default in the cluster cluster_deploy_nfs_provisioner_default_sc: false - diff --git a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/deployment.yaml b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/deployment.yaml index f0f956d1f1..10d57f8892 100644 --- a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/deployment.yaml +++ b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/deployment.yaml @@ -54,7 +54,7 @@ spec: app: nfs-provisioner replicas: 1 strategy: - type: Recreate + type: Recreate template: metadata: labels: diff --git a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/export-pv-claim.yaml b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/export-pv-claim.yaml index 429feddedc..d13b4055b6 100644 --- a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/export-pv-claim.yaml +++ b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/deploy/export-pv-claim.yaml @@ -8,4 +8,4 @@ spec: - ReadWriteOnce resources: requests: - storage: 500Gi \ No newline at end of file + storage: 500Gi diff --git a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-1.yaml b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-1.yaml index fda880e16a..daa4ce3aa3 100644 --- a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-1.yaml +++ b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-1.yaml @@ -19,4 +19,3 @@ spec: - name: nfs-pvc persistentVolumeClaim: claimName: shared-folder - diff --git a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-2.yaml b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-2.yaml index 38249f5cec..fe006d919c 100644 --- a/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-2.yaml +++ b/roles/cluster/cluster_deploy_nfs_provisioner/files/nfs-server-and-provisioner/usage/pod-2.yaml @@ -19,4 +19,3 @@ spec: - name: nfs-pvc persistentVolumeClaim: claimName: shared-folder - diff --git a/roles/cluster/cluster_deploy_nginx_server/defaults/main/config.yml b/roles/cluster/cluster_deploy_nginx_server/defaults/main/config.yml index 82e7ee8d27..218938606b 100644 --- a/roles/cluster/cluster_deploy_nginx_server/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_nginx_server/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_nginx_server +# Parameters # namespace where the server will be deployed. Will be create if it doesn't exist. # Mandatory value cluster_deploy_nginx_server_namespace: @@ -9,4 +10,3 @@ cluster_deploy_nginx_server_namespace: # directory containing the files to serve on the HTTP server. # Mandatory value cluster_deploy_nginx_server_directory: - diff --git a/roles/cluster/cluster_deploy_operator/defaults/main/config.yml b/roles/cluster/cluster_deploy_operator/defaults/main/config.yml index 4a3c44ce8c..d05e0c5ac8 100644 --- a/roles/cluster/cluster_deploy_operator/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_operator/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_operator +# Parameters # Name of the catalog containing the operator. # Mandatory value cluster_deploy_operator_catalog: @@ -37,4 +38,3 @@ cluster_deploy_operator_namespace_monitoring: false # If set, deploy the CSV in all the namespaces. # Type: Bool cluster_deploy_operator_all_namespaces: false - diff --git a/roles/cluster/cluster_deploy_operator/tasks/main.yml b/roles/cluster/cluster_deploy_operator/tasks/main.yml index af33ef8703..02450d91a9 100644 --- a/roles/cluster/cluster_deploy_operator/tasks/main.yml +++ b/roles/cluster/cluster_deploy_operator/tasks/main.yml @@ -193,7 +193,7 @@ template: src: "{{ cluster_deploy_operator_res_ns }}" dest: "{{ artifact_extra_logs_dir }}/src/000_namespace.yml" - mode: 0400 + mode: '0400' - name: Check if the namespace exists command: oc get "ns/{{ cluster_deploy_operator_namespace }}" @@ -217,7 +217,7 @@ template: src: "{{ cluster_deploy_operator_res_group }}" dest: "{{ artifact_extra_logs_dir }}/src/001_operator_group.yml" - mode: 0400 + mode: '0400' - name: Instantiate the OperatorHub OperatorGroup resource command: oc apply -f "{{ artifact_extra_logs_dir }}/src/001_operator_group.yml" @@ -226,7 +226,7 @@ template: src: "{{ cluster_deploy_operator_res_sub }}" dest: "{{ artifact_extra_logs_dir }}/src/002_sub.yml" - mode: 0400 + mode: '0400' - name: Instantiate the Subscription command: oc apply -f "{{ artifact_extra_logs_dir }}/src/002_sub.yml" diff --git a/roles/cluster/cluster_deploy_redis_server/defaults/main/config.yml b/roles/cluster/cluster_deploy_redis_server/defaults/main/config.yml index 4e54efc51a..3ea3c4fd9b 100644 --- a/roles/cluster/cluster_deploy_redis_server/defaults/main/config.yml +++ b/roles/cluster/cluster_deploy_redis_server/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.deploy_redis_server +# Parameters # namespace where the server will be deployed. Will be create if it doesn't exist. # Mandatory value cluster_deploy_redis_server_namespace: - diff --git a/roles/cluster/cluster_destroy_ocp/defaults/main/config.yml b/roles/cluster/cluster_destroy_ocp/defaults/main/config.yml index 85cbb3fb28..39bd174a93 100644 --- a/roles/cluster/cluster_destroy_ocp/defaults/main/config.yml +++ b/roles/cluster/cluster_destroy_ocp/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.destroy_ocp +# Parameters # The AWS region where the cluster lives. If empty and --confirm is passed, look up from the cluster. cluster_destroy_ocp_region: @@ -16,4 +17,3 @@ cluster_destroy_ocp_tag_value: owned # The path to the `openshift-install` to use to destroy the cluster. If empty, pick it up from the `deploy-cluster` subproject. cluster_destroy_ocp_openshift_install: openshift-install - diff --git a/roles/cluster/cluster_destroy_ocp/meta/main.yml b/roles/cluster/cluster_destroy_ocp/meta/main.yml index 46a38567c0..265abb2395 100644 --- a/roles/cluster/cluster_destroy_ocp/meta/main.yml +++ b/roles/cluster/cluster_destroy_ocp/meta/main.yml @@ -3,4 +3,3 @@ dependencies: - role: check_deps vars: check_deps_needs_cluster: false - diff --git a/roles/cluster/cluster_destroy_ocp/tasks/main.yml b/roles/cluster/cluster_destroy_ocp/tasks/main.yml index 994d107f29..ee017f5814 100644 --- a/roles/cluster/cluster_destroy_ocp/tasks/main.yml +++ b/roles/cluster/cluster_destroy_ocp/tasks/main.yml @@ -37,7 +37,7 @@ template: src: "{{ cluster_destroy_ocp_metadata_json }}" dest: "{{ artifact_extra_logs_dir }}/metadata.json" - mode: 0400 + mode: '0400' - name: Show metadata.json (debug) command: diff --git a/roles/cluster/cluster_destroy_osd/defaults/main/config.yml b/roles/cluster/cluster_destroy_osd/defaults/main/config.yml index 626f31f752..8a67516162 100644 --- a/roles/cluster/cluster_destroy_osd/defaults/main/config.yml +++ b/roles/cluster/cluster_destroy_osd/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.destroy_osd +# Parameters # The name of the cluster to destroy. # Mandatory value cluster_destroy_osd_cluster_name: - diff --git a/roles/cluster/cluster_destroy_osd/vars/main/resources.yml b/roles/cluster/cluster_destroy_osd/vars/main/resources.yml index 8b13789179..e69de29bb2 100644 --- a/roles/cluster/cluster_destroy_osd/vars/main/resources.yml +++ b/roles/cluster/cluster_destroy_osd/vars/main/resources.yml @@ -1 +0,0 @@ - diff --git a/roles/cluster/cluster_fill_workernodes/defaults/main/config.yml b/roles/cluster/cluster_fill_workernodes/defaults/main/config.yml index 072b6303a9..51a8d1d55e 100644 --- a/roles/cluster/cluster_fill_workernodes/defaults/main/config.yml +++ b/roles/cluster/cluster_fill_workernodes/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.fill_workernodes +# Parameters # namespace in which the place-holder Pods should be deployed cluster_fill_workernodes_namespace: default @@ -10,4 +11,3 @@ cluster_fill_workernodes_name: resource-placeholder # label to use to select the nodes to fill cluster_fill_workernodes_label_selector: node-role.kubernetes.io/worker - diff --git a/roles/cluster/cluster_fill_workernodes/tasks/fill_node.yaml b/roles/cluster/cluster_fill_workernodes/tasks/fill_node.yaml index 3c78833862..62ecc0f1d6 100644 --- a/roles/cluster/cluster_fill_workernodes/tasks/fill_node.yaml +++ b/roles/cluster/cluster_fill_workernodes/tasks/fill_node.yaml @@ -69,7 +69,7 @@ template: src: "{{ cluster_fill_workernodes_pod_template }}" dest: "{{ artifact_extra_logs_dir }}/src/pod_placeholder_{{ node_name }}.yaml" - mode: 0400 + mode: '0400' - name: Check if the Pod already exists command: diff --git a/roles/cluster/cluster_fill_workernodes/vars/main/resources.yml b/roles/cluster/cluster_fill_workernodes/vars/main/resources.yml index d7f105c1bd..eeb39dcbd2 100644 --- a/roles/cluster/cluster_fill_workernodes/vars/main/resources.yml +++ b/roles/cluster/cluster_fill_workernodes/vars/main/resources.yml @@ -1 +1 @@ -cluster_fill_workernodes_pod_template: roles/cluster/cluster_fill_workernodes/templates/pod_placeholder.yaml \ No newline at end of file +cluster_fill_workernodes_pod_template: roles/cluster/cluster_fill_workernodes/templates/pod_placeholder.yaml diff --git a/roles/cluster/cluster_preload_image/defaults/main/config.yml b/roles/cluster/cluster_preload_image/defaults/main/config.yml index 99d341f827..6b14894f7f 100644 --- a/roles/cluster/cluster_preload_image/defaults/main/config.yml +++ b/roles/cluster/cluster_preload_image/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.preload_image +# Parameters # Name to give to the DaemonSet used for preloading the image. # Mandatory value cluster_preload_image_name: @@ -24,4 +25,3 @@ cluster_preload_image_pod_toleration_key: # Pod toleration to apply to the DaemonSet. cluster_preload_image_pod_toleration_effect: - diff --git a/roles/cluster/cluster_preload_image/tasks/main.yml b/roles/cluster/cluster_preload_image/tasks/main.yml index e917f62a5b..330e64d345 100644 --- a/roles/cluster/cluster_preload_image/tasks/main.yml +++ b/roles/cluster/cluster_preload_image/tasks/main.yml @@ -9,7 +9,7 @@ template: src: "{{ cluster_preload_image_ds_template }}" dest: "{{ artifact_extra_logs_dir }}/src/preload_daemonset.yaml" - mode: 0400 + mode: '0400' - name: Delete the DaemonSet, it it exists command: diff --git a/roles/cluster/cluster_preload_image/vars/main/resources.yml b/roles/cluster/cluster_preload_image/vars/main/resources.yml index 0e11c02412..2ecf6beb73 100644 --- a/roles/cluster/cluster_preload_image/vars/main/resources.yml +++ b/roles/cluster/cluster_preload_image/vars/main/resources.yml @@ -1,2 +1,2 @@ --- -cluster_preload_image_ds_template: roles/cluster/cluster_preload_image/templates/daemonset.yaml.j2 \ No newline at end of file +cluster_preload_image_ds_template: roles/cluster/cluster_preload_image/templates/daemonset.yaml.j2 diff --git a/roles/cluster/cluster_prometheus_db/defaults/main/config.yml b/roles/cluster/cluster_prometheus_db/defaults/main/config.yml index 7df6575fd1..dbdc0c97f8 100644 --- a/roles/cluster/cluster_prometheus_db/defaults/main/config.yml +++ b/roles/cluster/cluster_prometheus_db/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.reset_prometheus_db +# Parameters # Mode in which the role will run. Can be 'reset' or 'dump'. cluster_prometheus_db_mode: reset @@ -11,6 +12,7 @@ cluster_prometheus_db_label: app.kubernetes.io/component=prometheus # Namespace where to search Promtheus Pod. cluster_prometheus_db_namespace: openshift-monitoring +# Constants # Prefix to apply to the db name in 'dump' mode # Defined as a constant in Cluster.reset_prometheus_db cluster_prometheus_db_dump_name_prefix: prometheus @@ -18,4 +20,3 @@ cluster_prometheus_db_dump_name_prefix: prometheus # Directory to dump on the Prometheus Pod # Defined as a constant in Cluster.reset_prometheus_db cluster_prometheus_db_directory: /prometheus - diff --git a/roles/cluster/cluster_set_project_annotation/defaults/main/config.yml b/roles/cluster/cluster_set_project_annotation/defaults/main/config.yml index ada5f41ef7..5472e0c3dc 100644 --- a/roles/cluster/cluster_set_project_annotation/defaults/main/config.yml +++ b/roles/cluster/cluster_set_project_annotation/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.set_project_annotation +# Parameters # The annotation key # Mandatory value cluster_set_project_annotation_key: @@ -14,4 +15,3 @@ cluster_set_project_annotation_project: null # If set, the annotation will be set for any new project. cluster_set_project_annotation_all: false - diff --git a/roles/cluster/cluster_set_scale/tasks/main.yml b/roles/cluster/cluster_set_scale/tasks/main.yml index dd31521779..19b66aba43 100644 --- a/roles/cluster/cluster_set_scale/tasks/main.yml +++ b/roles/cluster/cluster_set_scale/tasks/main.yml @@ -155,5 +155,3 @@ oc get machineset/{{ item }} -n openshift-machine-api > {{ artifact_extra_logs_dir }}/machineset_{{ item }}.status failed_when: false loop: "{{ oc_get_machinesets.stdout_lines }}" - - diff --git a/roles/cluster/cluster_undeploy_kepler/defaults/main/config.yml b/roles/cluster/cluster_undeploy_kepler/defaults/main/config.yml index f9eadc8776..be5337bfc2 100644 --- a/roles/cluster/cluster_undeploy_kepler/defaults/main/config.yml +++ b/roles/cluster/cluster_undeploy_kepler/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.undeploy_kepler - diff --git a/roles/cluster/cluster_undeploy_kepler/tasks/main.yml b/roles/cluster/cluster_undeploy_kepler/tasks/main.yml index 2d262088f3..ed40865638 100644 --- a/roles/cluster/cluster_undeploy_kepler/tasks/main.yml +++ b/roles/cluster/cluster_undeploy_kepler/tasks/main.yml @@ -16,7 +16,7 @@ git --git-dir "{{ kepler_location }}/.git" show - name: Undeploy kepler-operator - shell: + shell: cd "{{ kepler_location }}"; make uninstall; make undeploy 2>&1 register: undeploy_kepler failed_when: diff --git a/roles/cluster/cluster_undeploy_ldap/defaults/main/config.yml b/roles/cluster/cluster_undeploy_ldap/defaults/main/config.yml index e1c12ab809..11da123907 100644 --- a/roles/cluster/cluster_undeploy_ldap/defaults/main/config.yml +++ b/roles/cluster/cluster_undeploy_ldap/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.undeploy_ldap +# Parameters # Name of the LDAP identity provider. # Mandatory value cluster_undeploy_ldap_idp_name: @@ -14,4 +15,3 @@ cluster_undeploy_ldap_use_rosa: false # Cluster to use when using OCM or ROSA. cluster_undeploy_ldap_cluster_name: null - diff --git a/roles/cluster/cluster_upgrade_to_image/defaults/main/config.yml b/roles/cluster/cluster_upgrade_to_image/defaults/main/config.yml index 1a934716dc..2c4835874f 100644 --- a/roles/cluster/cluster_upgrade_to_image/defaults/main/config.yml +++ b/roles/cluster/cluster_upgrade_to_image/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Cluster.upgrade_to_image +# Parameters # The image to upgrade the cluster to # Mandatory value cluster_upgrade_to_image_image: - diff --git a/roles/codeflare/codeflare_capture_state/defaults/main/config.yml b/roles/codeflare/codeflare_capture_state/defaults/main/config.yml index 456d9ff041..c9ad00d7f1 100644 --- a/roles/codeflare/codeflare_capture_state/defaults/main/config.yml +++ b/roles/codeflare/codeflare_capture_state/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Codeflare.capture_state +# Parameters # name of the namespace where the Codeflare stack ran # Mandatory value codeflare_capture_state_namespace: - diff --git a/roles/codeflare/codeflare_cleanup_appwrappers/defaults/main/config.yml b/roles/codeflare/codeflare_cleanup_appwrappers/defaults/main/config.yml index fbefb44419..97ce116096 100644 --- a/roles/codeflare/codeflare_cleanup_appwrappers/defaults/main/config.yml +++ b/roles/codeflare/codeflare_cleanup_appwrappers/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Codeflare.cleanup_appwrappers +# Parameters # name of the namespace where the AppWrappers are deployed # Mandatory value codeflare_cleanup_appwrappers_namespace: - diff --git a/roles/codeflare/codeflare_cleanup_appwrappers/tasks/main.yml b/roles/codeflare/codeflare_cleanup_appwrappers/tasks/main.yml index c2cb53d744..7c36c84c02 100644 --- a/roles/codeflare/codeflare_cleanup_appwrappers/tasks/main.yml +++ b/roles/codeflare/codeflare_cleanup_appwrappers/tasks/main.yml @@ -36,7 +36,7 @@ template: src: "{{ codeclare_cleanup_mcad_canary_appwrapper_template }}" dest: "{{ artifact_extra_logs_dir }}/src/appwrapper.yaml" - mode: 0400 + mode: '0400' - name: Create the canary AppWrapper shell: diff --git a/roles/codeflare/codeflare_generate_mcad_load/defaults/main/config.yml b/roles/codeflare/codeflare_generate_mcad_load/defaults/main/config.yml index 48e42d8e62..3dfc00d5eb 100644 --- a/roles/codeflare/codeflare_generate_mcad_load/defaults/main/config.yml +++ b/roles/codeflare/codeflare_generate_mcad_load/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Codeflare.generate_mcad_load +# Parameters # name of the namespace where the MCAD load will be generated # Mandatory value codeflare_generate_mcad_load_namespace: @@ -41,4 +42,3 @@ codeflare_generate_mcad_load_timespan: 0 # the distribution method to use to spread the resource creation over the requested timespan codeflare_generate_mcad_load_distribution: poisson - diff --git a/roles/codeflare/codeflare_generate_mcad_load/vars/main/resources.yml b/roles/codeflare/codeflare_generate_mcad_load/vars/main/resources.yml index 4f31a57dfd..e68c5d539c 100644 --- a/roles/codeflare/codeflare_generate_mcad_load/vars/main/resources.yml +++ b/roles/codeflare/codeflare_generate_mcad_load/vars/main/resources.yml @@ -1 +1 @@ -mcad_load_generator: subprojects/mcad-workload-generator/generator.py \ No newline at end of file +mcad_load_generator: subprojects/mcad-workload-generator/generator.py diff --git a/roles/entitlement/entitlement_deploy/files/mc_pem.yml b/roles/entitlement/entitlement_deploy/files/mc_pem.yml index 86b2ad68b0..39155aeda1 100644 --- a/roles/entitlement/entitlement_deploy/files/mc_pem.yml +++ b/roles/entitlement/entitlement_deploy/files/mc_pem.yml @@ -13,7 +13,7 @@ spec: - contents: source: data:text/plain;charset=utf-8;base64,BASE64_ENCODED_PEM_FILE filesystem: root - mode: 0644 + mode: '0644' path: /etc/pki/entitlement/entitlement.pem --- apiVersion: machineconfiguration.openshift.io/v1 @@ -31,5 +31,5 @@ spec: - contents: source: data:text/plain;charset=utf-8;base64,BASE64_ENCODED_PEM_FILE filesystem: root - mode: 0644 + mode: '0644' path: /etc/pki/entitlement/entitlement-key.pem diff --git a/roles/entitlement/entitlement_deploy/files/mc_rhsm.yml b/roles/entitlement/entitlement_deploy/files/mc_rhsm.yml index 835fddd0ad..da11f117c2 100644 --- a/roles/entitlement/entitlement_deploy/files/mc_rhsm.yml +++ b/roles/entitlement/entitlement_deploy/files/mc_rhsm.yml @@ -13,5 +13,5 @@ spec: - contents: source: data:text/plain;charset=utf-8;base64,BASE64_ENCODED_RHSM_FILE filesystem: root - mode: 0644 + mode: '0644' path: /etc/rhsm/rhsm.conf diff --git a/roles/entitlement/entitlement_deploy/files/mc_rhsm_ca.yml b/roles/entitlement/entitlement_deploy/files/mc_rhsm_ca.yml index 4967172a00..f9a8aac7c8 100644 --- a/roles/entitlement/entitlement_deploy/files/mc_rhsm_ca.yml +++ b/roles/entitlement/entitlement_deploy/files/mc_rhsm_ca.yml @@ -13,5 +13,5 @@ spec: - contents: source: data:text/plain;charset=utf-8;base64,BASE64_ENCODED_RHSM_CA_FILE filesystem: root - mode: 0644 + mode: '0644' path: /etc/rhsm/ca/custom-repo-ca.pem diff --git a/roles/entitlement/entitlement_test_in_cluster/files/entitlement-tester_pod.yml b/roles/entitlement/entitlement_test_in_cluster/files/entitlement-tester_pod.yml index 456f4e0e4a..4857f33165 100644 --- a/roles/entitlement/entitlement_test_in_cluster/files/entitlement-tester_pod.yml +++ b/roles/entitlement/entitlement_test_in_cluster/files/entitlement-tester_pod.yml @@ -38,7 +38,7 @@ spec: volumes: - name: entrypoint configMap: - defaultMode: 0700 + defaultMode: '0700' name: entitlement-tester-entrypoint - name: host-etc-os-release hostPath: @@ -46,13 +46,13 @@ spec: - name: entitlement-rhsm secret: - defaultMode: 0400 + defaultMode: '0400' secretName: entitlement-tester-secret-files - name: entitlement-pem secret: - defaultMode: 0400 + defaultMode: '0400' secretName: entitlement-tester-secret-files - name: entitlement-pem-key secret: - defaultMode: 0400 + defaultMode: '0400' secretName: entitlement-tester-secret-files diff --git a/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml b/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml index 208e11bb9d..28bab7f533 100644 --- a/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml +++ b/roles/entitlement/entitlement_test_in_cluster/tasks/main.yml @@ -50,7 +50,7 @@ copy: content: "{{ entitlement_tester_logs.stdout }}" dest: "{{ artifact_extra_logs_dir }}/entitlement_tester.log" - mode: 0644 + mode: '0644' always: - name: Delete the entitlement secret diff --git a/roles/entitlement/entitlement_test_in_podman/tasks/main.yml b/roles/entitlement/entitlement_test_in_podman/tasks/main.yml index 891decb147..018b35109d 100644 --- a/roles/entitlement/entitlement_test_in_podman/tasks/main.yml +++ b/roles/entitlement/entitlement_test_in_podman/tasks/main.yml @@ -23,7 +23,7 @@ copy: content: "{{ entitlement_tester_pod_logs.stdout }}" dest: "{{ artifact_extra_logs_dir }}/entitlement_test_in_podman.log" - mode: 0644 + mode: '0644' - name: Fail when the test execution failed fail: msg="PEM key testing failed." diff --git a/roles/entitlement/entitlement_test_wait_deployment/files/entitlement-tester_pod.yml b/roles/entitlement/entitlement_test_wait_deployment/files/entitlement-tester_pod.yml index 3aabc7f1b8..083a640124 100644 --- a/roles/entitlement/entitlement_test_wait_deployment/files/entitlement-tester_pod.yml +++ b/roles/entitlement/entitlement_test_wait_deployment/files/entitlement-tester_pod.yml @@ -21,7 +21,7 @@ spec: volumes: - name: entrypoint configMap: - defaultMode: 0700 + defaultMode: '0700' name: entitlement-tester-entrypoint - name: host-etc-os-release hostPath: diff --git a/roles/gpu_operator/gpu_operator_deploy_from_operatorhub/tasks/deploy_from_catalog.yml b/roles/gpu_operator/gpu_operator_deploy_from_operatorhub/tasks/deploy_from_catalog.yml index 282ef62302..026895707a 100644 --- a/roles/gpu_operator/gpu_operator_deploy_from_operatorhub/tasks/deploy_from_catalog.yml +++ b/roles/gpu_operator/gpu_operator_deploy_from_operatorhub/tasks/deploy_from_catalog.yml @@ -99,7 +99,7 @@ template: src: "{{ gpu_operator_operatorhub_group }}" dest: "{{ artifact_extra_logs_dir }}/gpu_operator_group.yml" - mode: 0400 + mode: '0400' - name: Instantiate the OperatorHub OperatorGroup resource command: oc apply -f "{{ artifact_extra_logs_dir }}/gpu_operator_group.yml" @@ -108,7 +108,7 @@ template: src: "{{ gpu_operator_operatorhub_sub }}" dest: "{{ artifact_extra_logs_dir }}/gpu_operator_sub.yml" - mode: 0400 + mode: '0400' - name: Instantiate the OperatorHub subscription command: oc create -f "{{ artifact_extra_logs_dir }}/gpu_operator_sub.yml" diff --git a/roles/gpu_operator/gpu_operator_enable_time_sharing/defaults/main/config.yml b/roles/gpu_operator/gpu_operator_enable_time_sharing/defaults/main/config.yml index 0aaf266678..25d7276d91 100644 --- a/roles/gpu_operator/gpu_operator_enable_time_sharing/defaults/main/config.yml +++ b/roles/gpu_operator/gpu_operator_enable_time_sharing/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: GPU_Operator.enable_time_sharing +# Parameters # namespace in which the GPU Operator is deployed gpu_operator_enable_time_sharing_namespace: nvidia-gpu-operator @@ -10,4 +11,3 @@ gpu_operator_enable_time_sharing_replicas: 4 # name of the ConfigMap where the configuration will be stored gpu_operator_enable_time_sharing_configmap_name: time-slicing-config-all - diff --git a/roles/gpu_operator/gpu_operator_enable_time_sharing/tasks/main.yml b/roles/gpu_operator/gpu_operator_enable_time_sharing/tasks/main.yml index fb68c21c97..6211706d72 100644 --- a/roles/gpu_operator/gpu_operator_enable_time_sharing/tasks/main.yml +++ b/roles/gpu_operator/gpu_operator_enable_time_sharing/tasks/main.yml @@ -8,7 +8,7 @@ template: src: "{{ config_map_template }}" dest: "{{ artifact_extra_logs_dir }}/src/configmap.yaml" - mode: 0400 + mode: '0400' - name: Instanciate the ConfigMap command: @@ -43,4 +43,4 @@ shell: set -o pipefail; oc get node -lnvidia.com/gpu.present -ojson - | jq '.items[] | .metadata.name + " ==> "+ .status.allocatable["nvidia.com/gpu"] + " GPUs"' -r \ No newline at end of file + | jq '.items[] | .metadata.name + " ==> "+ .status.allocatable["nvidia.com/gpu"] + " GPUs"' -r 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 c2cd48b4aa..f770767b8b 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 @@ -40,6 +40,6 @@ set_fact: gpu_operator_version: '{{ gpu_operator_csv_version_cmd.stdout }}' -- name: Store the version as an artifacts file '{{ gpu_operator_csv_version_cmd.stdout }}' +- 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/gpu_operator/gpu_operator_run_gpu_burn/defaults/main/config.yml b/roles/gpu_operator/gpu_operator_run_gpu_burn/defaults/main/config.yml index 606a04e869..1e4923d974 100644 --- a/roles/gpu_operator/gpu_operator_run_gpu_burn/defaults/main/config.yml +++ b/roles/gpu_operator/gpu_operator_run_gpu_burn/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: GPU_Operator.run_gpu_burn +# Parameters # namespace in which GPU-burn will be executed gpu_operator_run_gpu_burn_namespace: default @@ -16,4 +17,3 @@ gpu_operator_run_gpu_burn_keep_resources: false # if true, fails if no GPU is available in the cluster. # Type: Bool gpu_operator_run_gpu_burn_ensure_has_gpu: true - diff --git a/roles/gpu_operator/gpu_operator_run_gpu_burn/tasks/main.yml b/roles/gpu_operator/gpu_operator_run_gpu_burn/tasks/main.yml index f6524087ea..248346e3ad 100644 --- a/roles/gpu_operator/gpu_operator_run_gpu_burn/tasks/main.yml +++ b/roles/gpu_operator/gpu_operator_run_gpu_burn/tasks/main.yml @@ -65,7 +65,7 @@ template: src: "{{ gpu_burn_pod }}" dest: "{{ artifact_extra_logs_dir }}/src/001_pod_gpu_burn_{{ gpu_node_name }}.yml" - mode: 0400 + mode: '0400' - name: Create GPU Burn Pods from template loop: "{{ gpu_burn_gpu_nodes.stdout_lines }}" diff --git a/roles/gpu_operator/gpu_operator_wait_stack_deployed/defaults/main/config.yml b/roles/gpu_operator/gpu_operator_wait_stack_deployed/defaults/main/config.yml index 1895aa2698..439d0fad0e 100644 --- a/roles/gpu_operator/gpu_operator_wait_stack_deployed/defaults/main/config.yml +++ b/roles/gpu_operator/gpu_operator_wait_stack_deployed/defaults/main/config.yml @@ -1,7 +1,7 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: GPU_Operator.wait_stack_deployed +# Parameters # namespace in which the GPU Operator is deployed gpu_operator_wait_stack_deployed_namespace: nvidia-gpu-operator - diff --git a/roles/load_aware/load_aware_deploy_trimaran/defaults/main/config.yml b/roles/load_aware/load_aware_deploy_trimaran/defaults/main/config.yml index fee9fd092f..15b3266457 100644 --- a/roles/load_aware/load_aware_deploy_trimaran/defaults/main/config.yml +++ b/roles/load_aware/load_aware_deploy_trimaran/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Load_Aware.deploy_trimaran +# Parameters # log verbosity to set the scheduler to run with, load_aware_deploy_trimaran_log_level: 1 @@ -31,4 +32,3 @@ load_aware_deploy_trimaran_risk_limit_weights_cpu: 0.5 # Memory limit load_aware_deploy_trimaran_risk_limit_weights_memory: 0.5 - diff --git a/roles/load_aware/load_aware_deploy_trimaran/tasks/main.yml b/roles/load_aware/load_aware_deploy_trimaran/tasks/main.yml index 6182b8ec90..7675881f98 100644 --- a/roles/load_aware/load_aware_deploy_trimaran/tasks/main.yml +++ b/roles/load_aware/load_aware_deploy_trimaran/tasks/main.yml @@ -50,7 +50,7 @@ register: token_size delay: 2 retries: 30 - until: token_size.stdout | int > 1000 + until: token_size.stdout | int > 1000 - name: Create the src artifacts directory file: @@ -66,9 +66,10 @@ template: src: "{{ trimaran_setup_template }}" dest: "{{ trimaran_setup_config }}" + mode: '0644' - name: Deploy Trimaran scheduler - shell: | + shell: | set -o errexit; set -o pipefail; set -o nounset; diff --git a/roles/load_aware/load_aware_scale_test/defaults/main/config.yml b/roles/load_aware/load_aware_scale_test/defaults/main/config.yml index 2007517744..3a932e3636 100644 --- a/roles/load_aware/load_aware_scale_test/defaults/main/config.yml +++ b/roles/load_aware/load_aware_scale_test/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Load_Aware.scale_test +# Parameters # what distribution to generate the load according to (poisson, normal, bimodal, gamma, or uniform) load_aware_scale_test_distribution: poisson @@ -19,4 +20,3 @@ load_aware_scale_test_scheduler: default # how long the sleep pod should sleep load_aware_scale_test_sleep_duration: 180 - diff --git a/roles/load_aware/load_aware_scale_test/tasks/main.yml b/roles/load_aware/load_aware_scale_test/tasks/main.yml index c2d4724ca5..4e1421fb54 100644 --- a/roles/load_aware/load_aware_scale_test/tasks/main.yml +++ b/roles/load_aware/load_aware_scale_test/tasks/main.yml @@ -25,7 +25,7 @@ always: - name: Dump info about scale test resources shell: | - oc get pods -n {{ load_aware_scale_test_namespace }} > "{{ artifact_extra_logs_dir }}/scale_test_pods.status" + oc get pods -n {{ load_aware_scale_test_namespace }} > "{{ artifact_extra_logs_dir }}/scale_test_pods.status" oc get pods -n {{ load_aware_scale_test_namespace }} -ojson > "{{ artifact_extra_logs_dir }}/scale_test_pods.json" ignore_errors: true diff --git a/roles/load_aware/load_aware_undeploy_trimaran/defaults/main/config.yml b/roles/load_aware/load_aware_undeploy_trimaran/defaults/main/config.yml index f504c54d7e..cbf7bc9125 100644 --- a/roles/load_aware/load_aware_undeploy_trimaran/defaults/main/config.yml +++ b/roles/load_aware/load_aware_undeploy_trimaran/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Load_Aware.undeploy_trimaran - diff --git a/roles/load_aware/load_aware_undeploy_trimaran/tasks/main.yml b/roles/load_aware/load_aware_undeploy_trimaran/tasks/main.yml index e16395464f..d4b6db5c89 100644 --- a/roles/load_aware/load_aware_undeploy_trimaran/tasks/main.yml +++ b/roles/load_aware/load_aware_undeploy_trimaran/tasks/main.yml @@ -16,7 +16,8 @@ template: src: "{{ trimaran_setup_template }}" dest: "{{ trimaran_setup_config }}" + mode: '0644' - name: Delete Trimaran resources - command: + command: oc delete -f {{ trimaran_setup_config }} --ignore-not-found diff --git a/roles/local_ci/local_ci_run/defaults/main/config.yml b/roles/local_ci/local_ci_run/defaults/main/config.yml index 75ed859cb8..fc8f09671b 100644 --- a/roles/local_ci/local_ci_run/defaults/main/config.yml +++ b/roles/local_ci/local_ci_run/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Local_CI.run +# Parameters # The CI command to run. # Mandatory value local_ci_run_ci_command: @@ -59,4 +60,3 @@ local_ci_run_pr_config: null # If True, updates the git repo with the latest main/PR before running the test. local_ci_run_update_git: true - diff --git a/roles/local_ci/local_ci_run/tasks/main.yml b/roles/local_ci/local_ci_run/tasks/main.yml index e8684a4c43..c2d058693c 100644 --- a/roles/local_ci/local_ci_run/tasks/main.yml +++ b/roles/local_ci/local_ci_run/tasks/main.yml @@ -18,7 +18,7 @@ template: src: "{{ local_ci_run_pod_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_pod.yaml" - mode: 0400 + mode: '0400' - name: Delete any stalled CI execution Pod command: oc delete -f "{{ artifact_extra_logs_dir }}/src/000_pod.yaml" --ignore-not-found=true diff --git a/roles/local_ci/local_ci_run_multi/defaults/main/config.yml b/roles/local_ci/local_ci_run_multi/defaults/main/config.yml index 538502ed0a..a472c8bed2 100644 --- a/roles/local_ci/local_ci_run_multi/defaults/main/config.yml +++ b/roles/local_ci/local_ci_run_multi/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Local_CI.run_multi +# Parameters # The CI command to run. # Mandatory value local_ci_run_multi_ci_command: @@ -69,4 +70,3 @@ local_ci_run_multi_user_batch_size: 1 # If true, let the Job abort the parallel execution on the first Pod failure. If false, ignore the process failure and track the overall failure count with a flag. local_ci_run_multi_abort_on_failure: false - diff --git a/roles/local_ci/local_ci_run_multi/tasks/main.yml b/roles/local_ci/local_ci_run_multi/tasks/main.yml index aafdc6f5ed..c2705b990f 100644 --- a/roles/local_ci/local_ci_run_multi/tasks/main.yml +++ b/roles/local_ci/local_ci_run_multi/tasks/main.yml @@ -43,7 +43,7 @@ template: src: "{{ local_ci_run_multi_job_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_job.yaml" - mode: 0400 + mode: '0400' - name: Delete any stalled CI execution Pod command: oc delete -f "{{ artifact_extra_logs_dir }}/src/000_job.yaml" --ignore-not-found=true @@ -93,7 +93,7 @@ cluster_prometheus_db_mode: dump cluster_prometheus_db_dump_name_prefix: prometheus_ocp when: local_ci_run_multi_capture_prom_db | bool - ignore_errors: yes + ignore_errors: true - name: Get the RHODS Prometheus database include_role: @@ -105,20 +105,20 @@ cluster_prometheus_db_directory: /prometheus/data cluster_prometheus_db_dump_name_prefix: prometheus_rhods when: local_ci_run_multi_capture_rhods_prom_db | bool - ignore_errors: yes + ignore_errors: true - name: Get the status of the CI Job shell: oc get -f "{{ artifact_extra_logs_dir }}/src/000_job.yaml" > "{{ artifact_extra_logs_dir }}/ci_job.status" - ignore_errors: yes + ignore_errors: true - name: Get the yaml of the CI Job shell: oc get -f "{{ artifact_extra_logs_dir }}/src/000_job.yaml" -oyaml > "{{ artifact_extra_logs_dir }}/ci_job.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the status of the CI Pods shell: @@ -126,7 +126,7 @@ -ljob-name={{ local_ci_run_multi_job_name }} -n {{ local_ci_run_multi_namespace }} > "{{ artifact_extra_logs_dir }}/ci_pods.status" - ignore_errors: yes + ignore_errors: true - name: Get the yaml of the CI Pods shell: @@ -134,7 +134,7 @@ -ljob-name={{ local_ci_run_multi_job_name }} -n {{ local_ci_run_multi_namespace }} > "{{ artifact_extra_logs_dir }}/ci_pods.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the JSON of the CI Pods shell: @@ -142,7 +142,7 @@ -ljob-name={{ local_ci_run_multi_job_name }} -n {{ local_ci_run_multi_namespace }} > "{{ artifact_extra_logs_dir }}/ci_pods.json" - ignore_errors: yes + ignore_errors: true - name: Create the CI Pod logs directory file: @@ -156,7 +156,7 @@ -ljob-name={{ local_ci_run_multi_job_name }} -n {{ local_ci_run_multi_namespace }} register: pod_names_cmd - ignore_errors: yes + ignore_errors: true # mute to reduce the log length no_log: true @@ -167,7 +167,7 @@ -n {{ local_ci_run_multi_namespace }} > "{{ artifact_extra_logs_dir }}/ci-pods_logs/$(basename "{{ item }}").log" loop: "{{ pod_names_cmd.stdout_lines }}" - ignore_errors: yes + ignore_errors: true # mute to reduce the log length no_log: true @@ -178,7 +178,7 @@ -n {{ local_ci_run_multi_minio_namespace }} -ojsonpath={.items[0].metadata.name} register: minio_podname_cmd - ignore_errors: yes + ignore_errors: true - name: Create the ci-pods_artifacts directory file: @@ -192,7 +192,7 @@ -c mc exec "{{ minio_podname_cmd.stdout }}" -- bash -c 'mkdir -p /artifacts/to_export && mc --config-dir /tmp cp minio/{{ local_ci_run_multi_minio_bucket_name }}/ /artifacts/to_export --recursive --quiet > /dev/null' - ignore_errors: yes + ignore_errors: true - name: Extract the test artifacts from the Minio S3 container shell: | @@ -202,7 +202,7 @@ rsync "{{ minio_podname_cmd.stdout }}:/artifacts/to_export/" "{{ artifact_extra_logs_dir }}/ci-pods_artifacts" --quiet rm -f "{{ artifact_extra_logs_dir }}/ci-pods_artifacts/os-release" - ignore_errors: yes + ignore_errors: true - name: Count how many Pods succeeded shell: diff --git a/roles/nfd/nfd_operator_deploy_from_operatorhub/tasks/main.yml b/roles/nfd/nfd_operator_deploy_from_operatorhub/tasks/main.yml index 99faf7b2ba..46dd004e6f 100644 --- a/roles/nfd/nfd_operator_deploy_from_operatorhub/tasks/main.yml +++ b/roles/nfd/nfd_operator_deploy_from_operatorhub/tasks/main.yml @@ -51,7 +51,7 @@ template: src: "{{ nfd_operator_operatorhub_sub }}" dest: "{{ artifact_extra_logs_dir }}/nfd_operator_sub.yml" - mode: 0400 + mode: '0400' - name: "Create the OperatorHub subscription for the NFD Operator (nfd_channel = {{ nfd_channel }})" command: oc apply -f "{{ artifact_extra_logs_dir }}/nfd_operator_sub.yml" diff --git a/roles/nfd/nfd_test_wait_gpu/tasks/main.yml b/roles/nfd/nfd_test_wait_gpu/tasks/main.yml index 6c32bcfaaa..e418456dae 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 if waiting is requested to {{ nfd_wait_gpu_nb_retries }} +- 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/defaults/main/config.yml b/roles/ocm/ocm_deploy_addon/defaults/main/config.yml index 4ed5625254..42dc03ba73 100644 --- a/roles/ocm/ocm_deploy_addon/defaults/main/config.yml +++ b/roles/ocm/ocm_deploy_addon/defaults/main/config.yml @@ -11,4 +11,3 @@ ocm_deploy_addon_cluster_name: # If true (default), will cause the role to wait until addon reports ready state. (Can time out) ocm_deploy_addon_wait_for_ready_state: true - diff --git a/roles/ocm/ocm_deploy_addon/tasks/main.yml b/roles/ocm/ocm_deploy_addon/tasks/main.yml index fa8374ee77..ee987b1d83 100644 --- a/roles/ocm/ocm_deploy_addon/tasks/main.yml +++ b/roles/ocm/ocm_deploy_addon/tasks/main.yml @@ -33,7 +33,7 @@ template: src: "{{ ocm_deploy_addon_template }}" dest: "{{ artifact_extra_logs_dir }}/addon_{{ ocm_deploy_addon_id }}.json" - mode: 0400 + mode: '0400' when: '"Error" in ocm_addon_precheck.stdout' - name: Install the following addon via OCM API {{ ocm_deploy_addon_id }} diff --git a/roles/pipelines/pipelines_capture_state/defaults/main/config.yml b/roles/pipelines/pipelines_capture_state/defaults/main/config.yml index b37b27f7b7..2667feb2b0 100644 --- a/roles/pipelines/pipelines_capture_state/defaults/main/config.yml +++ b/roles/pipelines/pipelines_capture_state/defaults/main/config.yml @@ -1,10 +1,10 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Pipelines.capture_state +# Parameters # the name of the application pipelines_capture_state_dsp_application_name: # the namespace in which the application was deployed pipelines_capture_state_namespace: - diff --git a/roles/pipelines/pipelines_deploy_application/defaults/main/config.yml b/roles/pipelines/pipelines_deploy_application/defaults/main/config.yml index 1a1f7a36f5..d4c3b656bb 100644 --- a/roles/pipelines/pipelines_deploy_application/defaults/main/config.yml +++ b/roles/pipelines/pipelines_deploy_application/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Pipelines.deploy_application +# Parameters # the name of the application to deploy # Mandatory value pipelines_deploy_application_name: @@ -13,4 +14,3 @@ pipelines_deploy_application_namespace: # Path of a file containing the properties of LDAP secrets. (See 'cluster deploy_ldap' command) # Mandatory value pipelines_deploy_application_secret_properties_file: - diff --git a/roles/pipelines/pipelines_deploy_application/tasks/main.yml b/roles/pipelines/pipelines_deploy_application/tasks/main.yml index 92c55e2065..0bbc7480f1 100644 --- a/roles/pipelines/pipelines_deploy_application/tasks/main.yml +++ b/roles/pipelines/pipelines_deploy_application/tasks/main.yml @@ -28,7 +28,7 @@ template: src: "{{ pipelines_deploy_application_app_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_dsp_application.yaml" - mode: 0400 + mode: '0400' - name: Create the application command: diff --git a/roles/pipelines/pipelines_run_kfp_notebook/defaults/main/config.yml b/roles/pipelines/pipelines_run_kfp_notebook/defaults/main/config.yml index 4abbe8119f..4b799fcee8 100644 --- a/roles/pipelines/pipelines_run_kfp_notebook/defaults/main/config.yml +++ b/roles/pipelines/pipelines_run_kfp_notebook/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Pipelines.run_kfp_notebook +# Parameters # Namespace in which the notebook will be deployed, if not deploying with RHODS. If empty, use the project return by 'oc project --short'. pipelines_run_kfp_notebook_namespace: @@ -28,4 +29,3 @@ pipelines_run_kfp_notebook_capture_artifacts: true # If True, captures the Prometheus DB of the systems. pipelines_run_kfp_notebook_capture_prom_db: false - diff --git a/roles/pipelines/pipelines_run_kfp_notebook/tasks/artifacts.yml b/roles/pipelines/pipelines_run_kfp_notebook/tasks/artifacts.yml index 21d7201566..303a666dce 100644 --- a/roles/pipelines/pipelines_run_kfp_notebook/tasks/artifacts.yml +++ b/roles/pipelines/pipelines_run_kfp_notebook/tasks/artifacts.yml @@ -5,7 +5,7 @@ cluster_prometheus_db_mode: dump cluster_prometheus_db_dump_name_prefix: artifacts-sutest/prometheus_ocp when: capture_prom_db | bool - ignore_errors: yes + ignore_errors: true - name: Get the RHODS Prometheus database include_role: @@ -17,7 +17,7 @@ cluster_prometheus_db_directory: /prometheus/data cluster_prometheus_db_dump_name_prefix: artifacts-sutest/prometheus_rhods when: capture_prom_db | bool - ignore_errors: yes + ignore_errors: true - name: Save the pods status shell: @@ -54,6 +54,7 @@ module: copy content: "{{ notebook_execution.stderr }}" dest: "{{ artifact_extra_logs_dir }}/notebook_execution.stderr" + mode: '0644' failed_when: false when: notebook_execution is defined diff --git a/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml b/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml index f240465821..8218252f18 100644 --- a/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml +++ b/roles/pipelines/pipelines_run_kfp_notebook/tasks/main.yml @@ -40,6 +40,7 @@ ansible.builtin.copy: src: "{{ pipelines_run_kfp_notebook_notebook_directory }}/" dest: "{{ artifact_extra_logs_dir }}/src/notebook-files" + mode: '0644' - name: Lookup the imagestream tag when: pipelines_run_kfp_notebook_imagestream_tag | length == 0 @@ -129,7 +130,7 @@ template: src: "{{ pipelines_run_kfp_notebook_benchmark_notebook_template }}" dest: "{{ notebook_src_template_dest }}" - mode: 0700 + mode: '0700' - name: Delete the notebook, if it exists command: diff --git a/roles/rhods/rhods_benchmark_notebook_performance/defaults/main/config.yml b/roles/rhods/rhods_benchmark_notebook_performance/defaults/main/config.yml index 1e2596b6c6..f2dacf8a5f 100644 --- a/roles/rhods/rhods_benchmark_notebook_performance/defaults/main/config.yml +++ b/roles/rhods/rhods_benchmark_notebook_performance/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.benchmark_notebook_performance +# Parameters # Namespace in which the notebook will be deployed, if not deploying with RHODS. rhods_benchmark_notebook_performance_namespace: rhods-notebooks @@ -32,7 +33,7 @@ rhods_benchmark_notebook_performance_benchmark_repeat: 1 # Type: Int rhods_benchmark_notebook_performance_benchmark_number: 1 +# Constants # Address where the imagestreams are stored. Used only when use_rhods=false. # Defined as a constant in RHODS.benchmark_notebook_performance rhods_benchmark_notebook_performance_imagestream_source_location: https://raw.githubusercontent.com/red-hat-data-services/odh-manifests/master/jupyterhub/notebook-images/overlays/additional - diff --git a/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml b/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml index d9f66cd606..69153ad7bd 100644 --- a/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml +++ b/roles/rhods/rhods_benchmark_notebook_performance/tasks/main.yml @@ -83,7 +83,7 @@ notebook_namespace: "{% if rhods_benchmark_notebook_performance_use_rhods | bool %}rhods-notebooks{% else %}{{ rhods_benchmark_notebook_performance_namespace }}{% endif %}" notebook_src_template_dest: "{{ artifact_extra_logs_dir }}/src/000_rhods_notebook.yaml" notebook_file_cm_name: rhods-notebook-files - capture_prom_db: no + capture_prom_db: false notebook_image_address: "{% if rhods_benchmark_notebook_performance_use_rhods | bool %}{{ rhods_image_address_cmd.stdout }}{% else %}{{ from_source_image_address_cmd.stdout }}{% endif %}" - name: Define the test environment @@ -116,7 +116,7 @@ template: src: "{{ rhods_benchmark_notebook_performance_benchmark_notebook_template }}" dest: "{{ notebook_src_template_dest }}" - mode: 0700 + mode: '0700' - name: Transform the Notebook into a Pod when: not rhods_benchmark_notebook_performance_use_rhods | bool diff --git a/roles/rhods/rhods_capture_state/defaults/main/config.yml b/roles/rhods/rhods_capture_state/defaults/main/config.yml index f119ae6d4d..0f65893fb3 100644 --- a/roles/rhods/rhods_capture_state/defaults/main/config.yml +++ b/roles/rhods/rhods_capture_state/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.capture_state - diff --git a/roles/rhods/rhods_cleanup_aws/defaults/main/config.yml b/roles/rhods/rhods_cleanup_aws/defaults/main/config.yml index 4b008b0069..c2ce9342bf 100644 --- a/roles/rhods/rhods_cleanup_aws/defaults/main/config.yml +++ b/roles/rhods/rhods_cleanup_aws/defaults/main/config.yml @@ -1,7 +1,7 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.cleanup_aws +# Parameters # path of the openshift_installer to use. If empty, download it. rhods_cleanup_aws_openshift_installer: - diff --git a/roles/rhods/rhods_cleanup_aws/tasks/main.yml b/roles/rhods/rhods_cleanup_aws/tasks/main.yml index e6a34e0e27..43677a1c24 100644 --- a/roles/rhods/rhods_cleanup_aws/tasks/main.yml +++ b/roles/rhods/rhods_cleanup_aws/tasks/main.yml @@ -88,7 +88,7 @@ template: src: "{{ rhods_cleanup_aws_metadata_json }}" dest: "{{ artifact_extra_logs_dir }}/metadata.json" - mode: 0400 + mode: '0400' - name: Get the path of the openshift-installer when: not rhods_cleanup_aws_openshift_installer diff --git a/roles/rhods/rhods_cleanup_notebooks/defaults/main/config.yml b/roles/rhods/rhods_cleanup_notebooks/defaults/main/config.yml index 42df1f8bc7..93d12eb289 100644 --- a/roles/rhods/rhods_cleanup_notebooks/defaults/main/config.yml +++ b/roles/rhods/rhods_cleanup_notebooks/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.cleanup_notebooks +# Parameters # Prefix of the usernames who created the resources. # Mandatory value rhods_cleanup_notebooks_username_prefix: - diff --git a/roles/rhods/rhods_delete_ods/defaults/main/config.yml b/roles/rhods/rhods_delete_ods/defaults/main/config.yml index 6579b87291..4df1404e82 100644 --- a/roles/rhods/rhods_delete_ods/defaults/main/config.yml +++ b/roles/rhods/rhods_delete_ods/defaults/main/config.yml @@ -1,7 +1,7 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.undeploy_ods +# Parameters # Namespace where RHODS is installed. rhods_delete_ods_namespace: redhat-ods-operator - diff --git a/roles/rhods/rhods_deploy_ods/defaults/main/config.yml b/roles/rhods/rhods_deploy_ods/defaults/main/config.yml index fb7e8ab23e..f455378b51 100644 --- a/roles/rhods/rhods_deploy_ods/defaults/main/config.yml +++ b/roles/rhods/rhods_deploy_ods/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.deploy_ods +# Parameters # Container image containing the RHODS bundle. # Mandatory value rhods_deploy_ods_catalog_image: @@ -15,4 +16,3 @@ rhods_deploy_ods_channel: # The version to deploy. Let empty to install the last version available. rhods_deploy_ods_version: - diff --git a/roles/rhods/rhods_deploy_ods/tasks/main.yml b/roles/rhods/rhods_deploy_ods/tasks/main.yml index a229cc04c3..ea2c75992f 100644 --- a/roles/rhods/rhods_deploy_ods/tasks/main.yml +++ b/roles/rhods/rhods_deploy_ods/tasks/main.yml @@ -18,7 +18,7 @@ template: src: "{{ rhods_install_ods_catalog }}" dest: "{{ artifact_extra_logs_dir }}/src/000_rhods_catalog.yml" - mode: 0400 + mode: '0400' - name: Delete the RHODS catalog if it exists command: oc delete -f "{{ artifact_extra_logs_dir }}/src/000_rhods_catalog.yml" --ignore-not-found diff --git a/roles/rhods/rhods_notebook_locust_scale_test/defaults/main/config.yml b/roles/rhods/rhods_notebook_locust_scale_test/defaults/main/config.yml index 57e7bb779d..590a323d27 100644 --- a/roles/rhods/rhods_notebook_locust_scale_test/defaults/main/config.yml +++ b/roles/rhods/rhods_notebook_locust_scale_test/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.notebook_locust_scale_test +# Parameters # Namespace where the test will run # Mandatory value rhods_notebook_locust_scale_test_namespace: @@ -77,4 +78,3 @@ rhods_notebook_locust_scale_test_user_sleep_factor: 1.0 # If True, captures the Prometheus DB of the systems. # Type: Bool rhods_notebook_locust_scale_test_capture_prom_db: true - diff --git a/roles/rhods/rhods_notebook_locust_scale_test/tasks/main.yml b/roles/rhods/rhods_notebook_locust_scale_test/tasks/main.yml index 3194070386..f406d9f0f0 100644 --- a/roles/rhods/rhods_notebook_locust_scale_test/tasks/main.yml +++ b/roles/rhods/rhods_notebook_locust_scale_test/tasks/main.yml @@ -54,7 +54,7 @@ template: src: "{{ rhods_notebook_locust_scale_test_job }}" dest: "{{ artifact_extra_logs_dir }}/src/000_rhods_notebook_locust_scale_test.yaml" - mode: 0400 + mode: '0400' - name: Delete the RHODS test entrypoint, if it exists command: @@ -205,7 +205,7 @@ (grep "{{ rhods_notebook_locust_scale_test_username_prefix }}" || true) | xargs --no-run-if-empty oc delete -n {{ rhods_notebook_namespace }} - ignore_errors: yes + ignore_errors: true - name: Cleanup the notebooks Pods and PVCs environment: @@ -216,7 +216,7 @@ (grep "{{ rhods_notebook_locust_scale_test_username_prefix }}" || true) | xargs --no-run-if-empty oc delete -n {{ rhods_notebook_namespace }} - ignore_errors: yes + ignore_errors: true - name: Capture the driver cluster artifacts include_tasks: artifacts_driver.yml @@ -230,12 +230,12 @@ date=$(date +%Y-%m-%d_%H:%M:%S) user_count={{ rhods_notebook_locust_scale_test_user_count }} EOF - ignore_errors: yes + ignore_errors: true - name: Generate MatrixBenchmark exit code file shell: (test -z "$(oc get jobs/{{ tester_job_name }} -ojsonpath={.status.failed} -n {{ rhods_notebook_locust_scale_test_namespace }})" && echo 0 || echo 1) > "{{ artifact_extra_logs_dir }}/exit_code" - ignore_errors: yes + ignore_errors: true - name: Test if the RHODS test job crashed command: diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/defaults/main/config.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/defaults/main/config.yml index 3de285c592..bdfa3412a7 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/defaults/main/config.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.notebook_ods_ci_scale_test +# Parameters # Namespace in which the scale test should be deployed. # Mandatory value rhods_notebook_ods_ci_scale_test_namespace: @@ -100,4 +101,3 @@ rhods_notebook_ods_ci_scale_test_only_create_notebooks: false # If True, consider that the driver Pods are running on Spot instances and can disappear at any time. # Type: Bool rhods_notebook_ods_ci_scale_test_driver_running_on_spot: false - diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts.yml index 37f97756e8..3d947999ff 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts.yml @@ -3,13 +3,13 @@ set -o pipefail; (cat "{{ artifact_extra_logs_dir }}"/ods-ci/ods-ci-*/test.exit_code | grep '^0$' || true) | wc -l register: success_count_cmd - ignore_errors: yes + ignore_errors: true - name: Count failed tests shell: set -o pipefail; (cat "{{ artifact_extra_logs_dir }}"/ods-ci/ods-ci-*/test.exit_code | grep -v '^0$' || true) | wc -l - ignore_errors: yes + ignore_errors: true - name: Count the number of workarounds required for Jira/RHODS-{{ bug_id }} shell: @@ -17,7 +17,7 @@ (ls "{{ artifact_extra_logs_dir }}"/ods-ci/ods-ci-*/bug_{{ bug_id }}*.png || true) | nl | tee "{{ artifact_extra_logs_dir }}"/workarounds_rhods-{{ bug_id }}.txt - ignore_errors: yes + ignore_errors: true loop: - 5912 loop_control: @@ -31,7 +31,7 @@ grep 'FAIL' $f | grep -v "^| FAIL|" | head -1 echo "" done > "{{ artifact_extra_logs_dir }}"/failed_tests - ignore_errors: yes + ignore_errors: true - name: Save the success count and failed tests shell: @@ -47,12 +47,12 @@ exclude_tags={{ rhods_notebook_ods_ci_scale_test_ods_ci_exclude_tags }} user_count={{ rhods_notebook_ods_ci_scale_test_user_count }} EOF - ignore_errors: yes + ignore_errors: true - name: Generate MatrixBenchmark exit code file shell: (test -z "$(oc get jobs/ods-ci -ojsonpath={.status.failed} -n {{ rhods_notebook_ods_ci_scale_test_namespace }})" && echo 0 || echo 1) > "{{ artifact_extra_logs_dir }}/exit_code" - ignore_errors: yes + ignore_errors: true - name: Save the artifacts version shell: diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_driver.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_driver.yml index cfce8a81e9..7365d1bedc 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_driver.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_driver.yml @@ -9,40 +9,40 @@ oc get job/{{ tester_job_name }} -n {{ tester_namespace }} > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_job.status" - ignore_errors: yes + ignore_errors: true - name: Get the yaml of the tester Job shell: oc get job/{{ tester_job_name }} -oyaml -n {{ tester_namespace }} > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_job.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the status of the tester Pods shell: oc get pods -ljob-name={{ tester_job_name }} -n {{ tester_namespace }} > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_pods.status" - ignore_errors: yes + ignore_errors: true - name: Get the yaml of the tester Pods shell: oc get pods -ljob-name={{ tester_job_name }} -oyaml -n {{ tester_namespace }} > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_pods.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the json of the tester Pods shell: oc get pods -ljob-name={{ tester_job_name }} -ojson -n {{ tester_namespace }} > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_pods.json" - ignore_errors: yes + ignore_errors: true - name: Get Minio Pod name command: oc get pod -lapp=minio -n {{ rhods_notebook_ods_ci_scale_test_minio_namespace }} -ojsonpath={.items[0].metadata.name} register: minio_podname_cmd - ignore_errors: yes + ignore_errors: true - name: Export the data out of the S3 bucket command: @@ -50,7 +50,7 @@ exec "{{ minio_podname_cmd.stdout }}" -- bash -c 'mkdir -p /artifacts/to_export && mc --config-dir /tmp cp minio/{{ rhods_notebook_ods_ci_scale_test_minio_bucket_name }}/ /artifacts/to_export --recursive --quiet > /dev/null' when: 'test_artifacts_collected != "none"' - ignore_errors: yes + ignore_errors: true - name: Extract the test artifacts from the Minio S3 container shell: | @@ -61,14 +61,14 @@ rm -f "{{ artifact_extra_logs_dir }}/os-release" when: 'test_artifacts_collected != "none"' - ignore_errors: yes + ignore_errors: true - name: Get the names of the tester_pods command: oc get pods -oname -ljob-name={{ tester_job_name }} -n {{ tester_namespace }} register: pod_names_cmd - ignore_errors: yes + ignore_errors: true # mute to reduce the log length no_log: true @@ -84,35 +84,35 @@ -n {{ tester_namespace }} \ > "{{ artifact_extra_logs_dir }}/artifacts-driver/tester_pod_logs/$(basename "{{ item }}").log"; loop: "{{ pod_names_cmd.stdout_lines }}" - ignore_errors: yes + ignore_errors: true # mute to reduce the log length no_log: true - name: Store the Cluster nodes in yaml shell: oc get nodes -oyaml > "{{ artifact_extra_logs_dir }}/artifacts-driver/nodes.yaml" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster nodes in json shell: oc get nodes -ojson > "{{ artifact_extra_logs_dir }}/artifacts-driver/nodes.json" - ignore_errors: yes + ignore_errors: true - name: Get the description of the nodes shell: oc describe nodes > "{{ artifact_extra_logs_dir }}/artifacts-driver/nodes.descr" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster machines status shell: oc get machines -n openshift-machine-api -owide > "{{ artifact_extra_logs_dir }}/artifacts-driver/machines.status" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster machines description shell: oc describe machines -n openshift-machine-api > "{{ artifact_extra_logs_dir }}/artifacts-driver/machines.desc" - ignore_errors: yes + ignore_errors: true - name: Get the Prometheus database include_role: @@ -121,4 +121,4 @@ cluster_prometheus_db_mode: dump cluster_prometheus_db_dump_name_prefix: artifacts-driver/prometheus_ocp when: capture_prom_db | bool - ignore_errors: yes + ignore_errors: true diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest.yml index 8c03429d84..64b0d972bc 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/artifacts_sutest.yml @@ -14,95 +14,95 @@ -n redhat-ods-applications > "{{ artifact_extra_logs_dir }}/artifacts-sutest/odh-dashboard-config.yaml" failed_when: false - ignore_errors: yes + ignore_errors: true - name: Get the RHODS CSV name shell: oc get csv -oname -n redhat-ods-operator | grep rhods-operator register: rhods_csv_cmd - ignore_errors: yes + ignore_errors: true - name: Store the RHODS version shell: oc get {{ rhods_csv_cmd.stdout }} -n redhat-ods-operator -oname | grep rhods-operator | cut -d/ -f2 | cut -d. -f2- > "{{ artifact_extra_logs_dir }}/artifacts-sutest/rhods.version" - ignore_errors: yes + ignore_errors: true failed_when: false - name: Store the RHODS creation timestamp shell: oc get {{ rhods_csv_cmd.stdout }} -n redhat-ods-operator -oname -ojsonpath={.metadata.annotations.createdAt} > "{{ artifact_extra_logs_dir }}/artifacts-sutest/rhods.createdAt" - ignore_errors: yes + ignore_errors: true failed_when: false - name: Store the RHODS CSV shell: oc get {{ rhods_csv_cmd.stdout }} -n redhat-ods-operator -oyaml > "{{ artifact_extra_logs_dir }}/artifacts-sutest/rhods.csv.yaml" - ignore_errors: yes + ignore_errors: true failed_when: false - name: Store OpenShift YAML version shell: oc version -oyaml > "{{ artifact_extra_logs_dir }}/artifacts-sutest/ocp_version.yml" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster nodes in yaml shell: oc get nodes -oyaml > "{{ artifact_extra_logs_dir }}/artifacts-sutest/nodes.yaml" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster nodes in json shell: oc get nodes -ojson > "{{ artifact_extra_logs_dir }}/artifacts-sutest/nodes.json" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster machines status shell: oc get machines -n openshift-machine-api -owide > "{{ artifact_extra_logs_dir }}/artifacts-sutest/machines.status" - ignore_errors: yes + ignore_errors: true - name: Store the Cluster machines description shell: oc describe machines -n openshift-machine-api > "{{ artifact_extra_logs_dir }}/artifacts-sutest/machines.desc" - ignore_errors: yes + ignore_errors: true - name: Get the description of the nodes shell: oc describe nodes > "{{ artifact_extra_logs_dir }}/artifacts-sutest/nodes.descr" - ignore_errors: yes + ignore_errors: true - name: Get the definition of all the statefulsets shell: oc get statefulsets -ojson -A > "{{ artifact_extra_logs_dir }}/artifacts-sutest/statefulsets.json" - ignore_errors: yes + ignore_errors: true - name: Get the definition of all the routes shell: oc get routes -ojson -A > "{{ artifact_extra_logs_dir }}/artifacts-sutest/routes.json" - ignore_errors: yes + ignore_errors: true - name: Get the definition of all the services shell: oc get services -ojson -A > "{{ artifact_extra_logs_dir }}/artifacts-sutest/services.json" - ignore_errors: yes + ignore_errors: true - name: Get the (safe) definition of the secrets shell: oc get -A secrets -ojson | jq 'del(.items[].data) | del(.items[].metadata.annotations)' > "{{ artifact_extra_logs_dir }}/artifacts-sutest/secrets_safe.json" - ignore_errors: yes + ignore_errors: true - name: Get the status of all the pvc shell: oc get pvc -A > "{{ artifact_extra_logs_dir }}/artifacts-sutest/pvc.status" - ignore_errors: yes + ignore_errors: true - name: Get the OpenShift Prometheus database include_role: @@ -111,7 +111,7 @@ cluster_prometheus_db_mode: dump cluster_prometheus_db_dump_name_prefix: artifacts-sutest/prometheus_ocp when: capture_prom_db | bool - ignore_errors: yes + ignore_errors: true - name: Get the RHODS Prometheus database include_role: @@ -123,4 +123,4 @@ cluster_prometheus_db_directory: /prometheus/data cluster_prometheus_db_dump_name_prefix: artifacts-sutest/prometheus_rhods when: capture_prom_db | bool - ignore_errors: yes + ignore_errors: true 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 74b929b090..489cb85d1b 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 namespace {{ rhods_notebook_namespace }} +- name: Count the notebooks in the namespace {{ rhods_notebook_namespace }} environment: KUBECONFIG: '{{ sut_cluster_kubeconfig }}' shell: @@ -48,14 +48,14 @@ oc get all -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/all.status" - ignore_errors: yes + ignore_errors: true - name: Get the status of the notebook resources shell: oc get notebooks -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebooks.status" - ignore_errors: yes + ignore_errors: true when: has_notebooks_crd.rc == 0 - name: Get the status of the notebook Pods @@ -63,21 +63,21 @@ oc get pods -owide -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebook_pods.status" - ignore_errors: yes + ignore_errors: true - name: Get the description of the notebook Pods shell: oc describe pods -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebook_pods.descr" - ignore_errors: yes + ignore_errors: true - name: Get the definition of the notebook resources shell: oc get notebooks -oyaml -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebooks.yaml" - ignore_errors: yes + ignore_errors: true when: has_notebooks_crd.rc == 0 - name: Get the json definition of the notebook resources @@ -85,7 +85,7 @@ oc get notebooks -ojson -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebooks.json" - ignore_errors: yes + ignore_errors: true when: has_notebooks_crd.rc == 0 - name: Get the definition of the notebook Pods @@ -93,21 +93,21 @@ oc get pods -oyaml -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebook_pods.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the json definition of the notebook Pods shell: oc get pods -ojson -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/notebook_pods.json" - ignore_errors: yes + ignore_errors: true - name: Get the json definition of the namespaces shell: oc get namespace -ojson -n {{ rhods_notebook_namespace }} > "{{ project_artifacts_dir }}/namespaces.json" - ignore_errors: yes + ignore_errors: true - name: Terminate the notebooks when: @@ -144,69 +144,69 @@ oc get all --show-labels -owide -A | grep "{{ rhods_notebook_ods_ci_scale_test_username_prefix }}" > "{{ project_artifacts_dir }}/all.status" - ignore_errors: yes + ignore_errors: true - name: Get the status of the notebook resources shell: oc get notebooks -owide -A | grep "{{ rhods_notebook_ods_ci_scale_test_username_prefix }}" > "{{ project_artifacts_dir }}/notebooks.status" - ignore_errors: yes + ignore_errors: true - name: Get the description of the notebook resources shell: oc describe notebooks -A | grep "{{ rhods_notebook_ods_ci_scale_test_username_prefix }}" > "{{ project_artifacts_dir }}/notebooks.descr" - ignore_errors: yes + ignore_errors: true - name: Get the status of the notebook Pods shell: oc get pods -owide -lopendatahub.io/dashboard=true -A | grep "{{ rhods_notebook_ods_ci_scale_test_username_prefix }}" > "{{ project_artifacts_dir }}/notebook_pods.status" - ignore_errors: yes + ignore_errors: true - name: Get the description of the notebook Pods shell: oc describe pods -lopendatahub.io/dashboard=true -A > "{{ project_artifacts_dir }}/notebook_pods.descr" - ignore_errors: yes + ignore_errors: true - name: Get the definition of the notebook resources shell: oc get notebooks -oyaml -lopendatahub.io/dashboard=true -A > "{{ project_artifacts_dir }}/notebooks.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the json definition of the notebook resources shell: oc get notebooks -ojson -lopendatahub.io/dashboard=true -A > "{{ project_artifacts_dir }}/notebooks.json" - ignore_errors: yes + ignore_errors: true - name: Get the definition of the notebook Pods shell: oc get pods -oyaml -lopendatahub.io/dashboard=true -A > "{{ project_artifacts_dir }}/notebook_pods.yaml" - ignore_errors: yes + ignore_errors: true - name: Get the json definition of the notebook Pods shell: oc get pods -ojson -lopendatahub.io/dashboard=true -A > "{{ project_artifacts_dir }}/notebook_pods.json" - ignore_errors: yes + ignore_errors: true - name: Get the json definition of the namespaces shell: oc get namespace -ojson -lopendatahub.io/dashboard=true > "{{ project_artifacts_dir }}/namespaces.json" - ignore_errors: yes + ignore_errors: true - name: Terminate the notebooks shell: diff --git a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/main.yml b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/main.yml index 4661743846..d72ed3b09c 100644 --- a/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/main.yml +++ b/roles/rhods/rhods_notebook_ods_ci_scale_test/tasks/main.yml @@ -176,7 +176,7 @@ template: src: "{{ rhods_notebook_ods_ci_scale_test_job }}" dest: "{{ artifact_extra_logs_dir }}/src/000_rhods_notebook_ods_ci_scale_test.yaml" - mode: 0400 + mode: '0400' - name: Delete the RHODS test entrypoint, if it exists command: diff --git a/roles/rhods/rhods_undeploy_ods/defaults/main/config.yml b/roles/rhods/rhods_undeploy_ods/defaults/main/config.yml index b3540161e8..c0dbe78e9d 100644 --- a/roles/rhods/rhods_undeploy_ods/defaults/main/config.yml +++ b/roles/rhods/rhods_undeploy_ods/defaults/main/config.yml @@ -1,7 +1,6 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.undeploy_ods # Namespace where RHODS is installed. rhods_undeploy_ods_namespace: redhat-ods-operator - diff --git a/roles/rhods/rhods_undeploy_ods/vars/main/resources.yml b/roles/rhods/rhods_undeploy_ods/vars/main/resources.yml index cc59781d8b..e0808e9725 100644 --- a/roles/rhods/rhods_undeploy_ods/vars/main/resources.yml +++ b/roles/rhods/rhods_undeploy_ods/vars/main/resources.yml @@ -1 +1 @@ -rhods_undeploy_ods_delete_cm: "roles/rhods/rhods_undeploy_ods/files/cm_delete.yml" \ No newline at end of file +rhods_undeploy_ods_delete_cm: "roles/rhods/rhods_undeploy_ods/files/cm_delete.yml" diff --git a/roles/rhods/rhods_wait_odh/defaults/main/config.yml b/roles/rhods/rhods_wait_odh/defaults/main/config.yml index 30b963d4df..c3917801f9 100644 --- a/roles/rhods/rhods_wait_odh/defaults/main/config.yml +++ b/roles/rhods/rhods_wait_odh/defaults/main/config.yml @@ -1,7 +1,7 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.wait_odh +# Parameters # namespace in which ODH is deployed rhods_wait_odh_namespace: opendatahub - diff --git a/roles/rhods/rhods_wait_ods/defaults/main/config.yml b/roles/rhods/rhods_wait_ods/defaults/main/config.yml index 72e4f97f29..907389d0f9 100644 --- a/roles/rhods/rhods_wait_ods/defaults/main/config.yml +++ b/roles/rhods/rhods_wait_ods/defaults/main/config.yml @@ -1,8 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: RHODS.wait_ods +# Constants # Comma-separated list of the RHODS images that should be awaited # Defined as a constant in RHODS.wait_ods rhods_wait_ods_images: s2i-minimal-notebook,s2i-generic-data-science-notebook - diff --git a/roles/utils/utils_build_push_image/defaults/main/config.yml b/roles/utils/utils_build_push_image/defaults/main/config.yml index 838faaf48f..7841b7a350 100644 --- a/roles/utils/utils_build_push_image/defaults/main/config.yml +++ b/roles/utils/utils_build_push_image/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Utils.build_push_image +# Parameters # Name of locally built image. # Mandatory value utils_build_push_image_image_local_name: @@ -40,4 +41,3 @@ utils_build_push_image_from_image: null # Base imagestreamtag to use, instead of the FROM image specified in the Dockerfile. utils_build_push_image_from_imagetag: null - diff --git a/roles/utils/utils_build_push_image/tasks/build_helper.yml b/roles/utils/utils_build_push_image/tasks/build_helper.yml index 46cd4ea29c..f2766edebe 100644 --- a/roles/utils/utils_build_push_image/tasks/build_helper.yml +++ b/roles/utils/utils_build_push_image/tasks/build_helper.yml @@ -2,7 +2,7 @@ template: src: "{{ utils_helper_image_buildconfig }}" dest: "{{ artifact_extra_logs_dir }}/003_helper_buildconfig.yml" - mode: 0400 + mode: '0400' - name: Apply helper image BuildConfig command: diff --git a/roles/utils/utils_build_push_image/tasks/build_image.yml b/roles/utils/utils_build_push_image/tasks/build_image.yml index 0eb4083b9c..8f12a10852 100644 --- a/roles/utils/utils_build_push_image/tasks/build_image.yml +++ b/roles/utils/utils_build_push_image/tasks/build_image.yml @@ -8,7 +8,7 @@ template: src: "{{ utils_image_buildconfig }}" dest: "{{ artifact_extra_logs_dir }}/src/002_image_buildconfig.yml" - mode: 0400 + mode: '0400' - name: Delete old image BuildConfig if exists command: diff --git a/roles/utils/utils_build_push_image/tasks/run_push_pod.yml b/roles/utils/utils_build_push_image/tasks/run_push_pod.yml index b5ab704496..26e455c2e0 100644 --- a/roles/utils/utils_build_push_image/tasks/run_push_pod.yml +++ b/roles/utils/utils_build_push_image/tasks/run_push_pod.yml @@ -49,7 +49,7 @@ template: src: "{{ utils_helper_image_push_pod }}" dest: "{{ artifact_extra_logs_dir }}/005_push-helper-pod.yml" - mode: 0400 + mode: '0400' - name: Delete image push pod if already exists command: diff --git a/roles/watsonx_serving/watsonx_serving_capture_operators_state/defaults/main/config.yml b/roles/watsonx_serving/watsonx_serving_capture_operators_state/defaults/main/config.yml index 5c9d6a845a..3ddec9c024 100644 --- a/roles/watsonx_serving/watsonx_serving_capture_operators_state/defaults/main/config.yml +++ b/roles/watsonx_serving/watsonx_serving_capture_operators_state/defaults/main/config.yml @@ -1,4 +1,3 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Watsonx_Serving.capture_operators_state - diff --git a/roles/watsonx_serving/watsonx_serving_capture_state/defaults/main/config.yml b/roles/watsonx_serving/watsonx_serving_capture_state/defaults/main/config.yml index ec26b97453..0ad8563601 100644 --- a/roles/watsonx_serving/watsonx_serving_capture_state/defaults/main/config.yml +++ b/roles/watsonx_serving/watsonx_serving_capture_state/defaults/main/config.yml @@ -1,7 +1,7 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Watsonx_Serving.capture_state +# Parameters # the namespace in which the Serving stack was deployed. If empty, use the current project. watsonx_serving_capture_state_namespace: - diff --git a/roles/watsonx_serving/watsonx_serving_deploy_model/defaults/main/config.yml b/roles/watsonx_serving/watsonx_serving_deploy_model/defaults/main/config.yml index f59fc1ac55..8f69b8df47 100644 --- a/roles/watsonx_serving/watsonx_serving_deploy_model/defaults/main/config.yml +++ b/roles/watsonx_serving/watsonx_serving_deploy_model/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Watsonx_Serving.deploy_model +# Parameters # the namespace in which the model should be deployed # Mandatory value watsonx_serving_deploy_model_namespace: @@ -29,4 +30,3 @@ watsonx_serving_deploy_model_storage_uri: # name of the service account to use for running the Pod # Mandatory value watsonx_serving_deploy_model_sa_name: - diff --git a/roles/watsonx_serving/watsonx_serving_deploy_model/tasks/main.yml b/roles/watsonx_serving/watsonx_serving_deploy_model/tasks/main.yml index 48fdef33e0..84fffcdd70 100644 --- a/roles/watsonx_serving/watsonx_serving_deploy_model/tasks/main.yml +++ b/roles/watsonx_serving/watsonx_serving_deploy_model/tasks/main.yml @@ -74,7 +74,7 @@ template: src: "{{ serving_runtime_template }}" dest: "{{ artifact_extra_logs_dir }}/src/serving_runtime.yaml" - mode: 0400 + mode: '0400' - name: Create the ServingRuntime command: @@ -86,7 +86,7 @@ template: src: "{{ inference_service_template }}" dest: "{{ artifact_extra_logs_dir }}/src/inference_service.yaml" - mode: 0400 + mode: '0400' - name: Create the InferenceService command: diff --git a/roles/watsonx_serving/watsonx_serving_validate_model/defaults/main/config.yml b/roles/watsonx_serving/watsonx_serving_validate_model/defaults/main/config.yml index 48af080b9c..a98c795ac1 100644 --- a/roles/watsonx_serving/watsonx_serving_validate_model/defaults/main/config.yml +++ b/roles/watsonx_serving/watsonx_serving_validate_model/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Watsonx_Serving.validate_model +# Parameters # a list of names of the inference service to validate # Mandatory value watsonx_serving_validate_model_inference_service_names: @@ -16,4 +17,3 @@ watsonx_serving_validate_model_query_data: # the namespace in which the Serving stack was deployed. If empty, use the current project. watsonx_serving_validate_model_namespace: - diff --git a/roles/watsonx_serving/watsonx_serving_validate_model/tasks/validate_model.yaml b/roles/watsonx_serving/watsonx_serving_validate_model/tasks/validate_model.yaml index 568d19ed53..5838485a84 100644 --- a/roles/watsonx_serving/watsonx_serving_validate_model/tasks/validate_model.yaml +++ b/roles/watsonx_serving/watsonx_serving_validate_model/tasks/validate_model.yaml @@ -38,7 +38,7 @@ - name: Save the number of attempts local_action: - copy content={{ grpc_working_cmd }} dest={{ artifact_extra_logs_dir }}/{{ watsonx_serving_validate_model_inference_service_name }}/attempts.json + copy content={{ grpc_working_cmd }} dest={{ artifact_extra_logs_dir }}/{{ watsonx_serving_validate_model_inference_service_name }}/attempts.json mode='0644' - name: Prettify the file shell: | diff --git a/roles/wisdom/wisdom_deploy_model/defaults/main/config.yml b/roles/wisdom/wisdom_deploy_model/defaults/main/config.yml index 4be6f76225..879395c593 100644 --- a/roles/wisdom/wisdom_deploy_model/defaults/main/config.yml +++ b/roles/wisdom/wisdom_deploy_model/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Wisdom.deploy_model +# Parameters # Model Mesh Deployment replicas # Mandatory value wisdom_deploy_model_replicas: @@ -31,4 +32,3 @@ wisdom_deploy_model_serving_runtime_name: wisdom-runtime # Namespace to deploy the model wisdom_deploy_model_namespace: wisdom - diff --git a/roles/wisdom/wisdom_deploy_model/tasks/main.yml b/roles/wisdom/wisdom_deploy_model/tasks/main.yml index 01809de9d4..985877cbb0 100644 --- a/roles/wisdom/wisdom_deploy_model/tasks/main.yml +++ b/roles/wisdom/wisdom_deploy_model/tasks/main.yml @@ -25,7 +25,7 @@ state: directory mode: '0755' -#TODO: Create the S3 and Quay secret using YAML from the vault +# TODO: Create the S3 and Quay secret using YAML from the vault - name: Ensure that the S3 secret file exists stat: path: "{{ wisdom_deploy_model_s3_secret_path }}" @@ -37,7 +37,7 @@ - name: Delete the S3 secret, if it exists command: oc delete -f {{ wisdom_deploy_model_s3_secret_path }} --ignore-not-found -n {{ wisdom_deploy_model_namespace }} -- name: Create the S3 secret +- name: Create the S3 secret command: oc create -f {{ wisdom_deploy_model_s3_secret_path }} -n {{ wisdom_deploy_model_namespace }} - name: Delete the quay pull secret, if it exists @@ -51,9 +51,9 @@ template: src: "{{ model_serving_config_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_model_serving_config.yml" - mode: 0400 + mode: '0400' -- name: Create or update the ConfigMap "model-serving-config" +- name: Create or update the ConfigMap "model-serving-config" command: oc apply -f "{{ artifact_extra_logs_dir }}/src/000_model_serving_config.yml" # ServingRuntime @@ -61,7 +61,7 @@ template: src: "{{ serving_runtime_template }}" dest: "{{ artifact_extra_logs_dir }}/src/001_serving_runtime.yml" - mode: 0400 + mode: '0400' - name: Create or update ServingRuntime command: oc apply -f "{{ artifact_extra_logs_dir }}/src/001_serving_runtime.yml" @@ -71,7 +71,7 @@ template: src: "{{ inference_service_template }}" dest: "{{ artifact_extra_logs_dir }}/src/002_inference_service.yml" - mode: 0400 + mode: '0400' - name: Create or update InferenceService command: oc apply -f "{{ artifact_extra_logs_dir }}/src/002_inference_service.yml" @@ -81,9 +81,9 @@ set -o pipefail oc patch serviceaccount modelmesh-serving-sa -n {{ wisdom_deploy_model_namespace }} -p '{"imagePullSecrets": [{"name": "quay-io"}]}' oc delete pods --all --force -n {{ wisdom_deploy_model_namespace }} - -# Wait for wisdom Pods to be ready. + +# Wait for wisdom Pods to be ready. # Max time is 15 minutes to give time for the GPU operator stack and image pull to complete. - name: Wait for wisdom model mesh Pods to be ready block: @@ -122,8 +122,8 @@ template: src: "{{ wisdom_tester_pod }}" dest: "{{ artifact_extra_logs_dir }}/src/003_wisdom_tester_pod.yml" - mode: 0400 - + mode: '0400' + - name: Delete the wisdom tester Pod if it exists command: oc delete --ignore-not-found -f "{{ artifact_extra_logs_dir }}/src/003_wisdom_tester_pod.yml" -n {{ wisdom_deploy_model_namespace }} diff --git a/roles/wisdom/wisdom_llm_load_test/defaults/main/config.yml b/roles/wisdom/wisdom_llm_load_test/defaults/main/config.yml index 1e0d1f1131..bb63baf26a 100644 --- a/roles/wisdom/wisdom_llm_load_test/defaults/main/config.yml +++ b/roles/wisdom/wisdom_llm_load_test/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Wisdom.run_llm_load_test +# Parameters # Requests sent for each model input in the dataset (will be set in llm-load-test config.json) # Mandatory value wisdom_llm_load_test_requests: @@ -36,4 +37,3 @@ wisdom_llm_load_test_tester_image_tag: # Namespace to deploy the model wisdom_llm_load_test_namespace: wisdom - diff --git a/roles/wisdom/wisdom_llm_load_test/tasks/main.yml b/roles/wisdom/wisdom_llm_load_test/tasks/main.yml index bba245544d..1af388cfe2 100644 --- a/roles/wisdom/wisdom_llm_load_test/tasks/main.yml +++ b/roles/wisdom/wisdom_llm_load_test/tasks/main.yml @@ -40,7 +40,7 @@ template: src: "{{ llm_load_test_config_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_llm_load_test_config.json" - mode: 0400 + mode: '0400' - name: Create the llm-load-test-config ConfigMap command: oc create configmap llm-load-test-config --from-file=config.json="{{ artifact_extra_logs_dir }}/src/000_llm_load_test_config.json" -n {{ wisdom_llm_load_test_namespace }} @@ -53,11 +53,11 @@ template: src: "{{ llm_load_test_pod_template }}" dest: "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" - mode: 0400 + mode: '0400' - name: Delete the llm-load-test Pod if it exists command: oc delete --ignore-not-found -f "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" -n {{ wisdom_llm_load_test_namespace }} - + - name: Create the llm-load-test Pod command: oc create -f "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" -n {{ wisdom_llm_load_test_namespace }} diff --git a/roles/wisdom/wisdom_llm_load_test/vars/main/resources.yml b/roles/wisdom/wisdom_llm_load_test/vars/main/resources.yml index 217d1d18e8..9258af0c4c 100644 --- a/roles/wisdom/wisdom_llm_load_test/vars/main/resources.yml +++ b/roles/wisdom/wisdom_llm_load_test/vars/main/resources.yml @@ -1,4 +1,3 @@ --- llm_load_test_config_template: 'templates/llm-load-test-config.json.j2' llm_load_test_pod_template: 'templates/llm-load-test_pod.yml.j2' - diff --git a/roles/wisdom/wisdom_llm_load_test_multiplexed/defaults/main/config.yml b/roles/wisdom/wisdom_llm_load_test_multiplexed/defaults/main/config.yml index 43f1b835d6..050dae0806 100644 --- a/roles/wisdom/wisdom_llm_load_test_multiplexed/defaults/main/config.yml +++ b/roles/wisdom/wisdom_llm_load_test_multiplexed/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Wisdom.run_llm_load_test_multiplexed +# Parameters # Requests sent for each model input in the dataset (will be set in llm-load-test config.json) # Mandatory value wisdom_llm_load_test_multiplexed_requests: @@ -40,4 +41,3 @@ wisdom_llm_load_test_multiplexed_tester_image_tag: # Namespace to deploy the model wisdom_llm_load_test_multiplexed_namespace: wisdom - diff --git a/roles/wisdom/wisdom_llm_load_test_multiplexed/tasks/main.yml b/roles/wisdom/wisdom_llm_load_test_multiplexed/tasks/main.yml index 2afe15e5e6..badbf196a5 100644 --- a/roles/wisdom/wisdom_llm_load_test_multiplexed/tasks/main.yml +++ b/roles/wisdom/wisdom_llm_load_test_multiplexed/tasks/main.yml @@ -40,7 +40,7 @@ template: src: "{{ llm_load_test_config_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_llm_load_test_config.json" - mode: 0400 + mode: '0400' - name: Create the llm-load-test-config ConfigMap command: oc create configmap llm-load-test-config --from-file=config.json="{{ artifact_extra_logs_dir }}/src/000_llm_load_test_config.json" -n {{ wisdom_llm_load_test_multiplexed_namespace }} @@ -53,11 +53,11 @@ template: src: "{{ llm_load_test_pod_template }}" dest: "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" - mode: 0400 + mode: '0400' - name: Delete the llm-load-test Pod if it exists command: oc delete --ignore-not-found -f "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" -n {{ wisdom_llm_load_test_multiplexed_namespace }} - + - name: Create the llm-load-test Pod command: oc create -f "{{ artifact_extra_logs_dir }}/src/001_llm_load_test_pod.yml" -n {{ wisdom_llm_load_test_multiplexed_namespace }} diff --git a/roles/wisdom/wisdom_llm_load_test_multiplexed/vars/main/resources.yml b/roles/wisdom/wisdom_llm_load_test_multiplexed/vars/main/resources.yml index 217d1d18e8..9258af0c4c 100644 --- a/roles/wisdom/wisdom_llm_load_test_multiplexed/vars/main/resources.yml +++ b/roles/wisdom/wisdom_llm_load_test_multiplexed/vars/main/resources.yml @@ -1,4 +1,3 @@ --- llm_load_test_config_template: 'templates/llm-load-test-config.json.j2' llm_load_test_pod_template: 'templates/llm-load-test_pod.yml.j2' - diff --git a/roles/wisdom/wisdom_warmup_model/defaults/main/config.yml b/roles/wisdom/wisdom_warmup_model/defaults/main/config.yml index df6562b235..6c8e52d077 100644 --- a/roles/wisdom/wisdom_warmup_model/defaults/main/config.yml +++ b/roles/wisdom/wisdom_warmup_model/defaults/main/config.yml @@ -1,7 +1,8 @@ -# Auto-generated file, do not edit manually ... +# Auto-generated file, do not edit manually ... # Toolbox generate command: repo generate_ansible_default_settings # Source component: Wisdom.warmup_model +# Parameters # Path to protos directory to put into a ConfigMap, and mounted in Pod # Mandatory value wisdom_warmup_model_protos_path: @@ -22,4 +23,3 @@ wisdom_warmup_model_total_requests: '4096' # Namespace to deploy the model wisdom_warmup_model_namespace: wisdom - diff --git a/roles/wisdom/wisdom_warmup_model/tasks/main.yml b/roles/wisdom/wisdom_warmup_model/tasks/main.yml index 5cc06cd1a1..a2c9477424 100644 --- a/roles/wisdom/wisdom_warmup_model/tasks/main.yml +++ b/roles/wisdom/wisdom_warmup_model/tasks/main.yml @@ -28,7 +28,7 @@ template: src: "{{ wisdom_warmup_pod_template }}" dest: "{{ artifact_extra_logs_dir }}/src/000_wisdom_warmup_pod.yml" - mode: 0400 + mode: '0400' - name: Delete the wisdom warmup Pod if it exists command: oc delete --ignore-not-found -f "{{ artifact_extra_logs_dir }}/src/000_wisdom_warmup_pod.yml" -n {{ wisdom_warmup_model_namespace }} diff --git a/testing/codeflare/test_templates.yaml b/testing/codeflare/test_templates.yaml index 734edb1da9..bd0c61ade6 100644 --- a/testing/codeflare/test_templates.yaml +++ b/testing/codeflare/test_templates.yaml @@ -16,7 +16,7 @@ common_gpu: node: instance_type: g4dn.xlarge wait_gpus: true - timespan: 5 #minutes + timespan: 5 # minutes common_cpu: extends: [common] @@ -31,7 +31,7 @@ common_cpu: node: instance_type: m6i.2xlarge wait_gpus: false - timespan: 5 #minutes + timespan: 5 # minutes common_unschedulable: aw: @@ -45,7 +45,7 @@ common_unschedulable: common_scheduling: {} common_all_schedulable: - timespan: 1 #minutes + timespan: 1 # minutes common_job_mode: aw: @@ -97,4 +97,4 @@ cpu_light_unschedulable: count: 200 pod: requests: - cpu: 150 \ No newline at end of file + cpu: 150 diff --git a/testing/lightspeed/config.yaml b/testing/lightspeed/config.yaml index e6775ee15e..4753e2b98d 100644 --- a/testing/lightspeed/config.yaml +++ b/testing/lightspeed/config.yaml @@ -10,14 +10,14 @@ ci_presets: ansible_llm_light: tests.ansible_llm.test_cases: [[1, 16]] tests.ansible_llm.multiplexed_test_cases: [[1, 16]] - + light: extends: [light_cluster, ansible_llm_light] keep: clusters.create.keep: true clusters.create.ocp.tags.Project: PSAP/RHODS/Wisdom - #clusters.create.ocp.tags.TicketId: #TODO + # clusters.create.ocp.tags.TicketId: #TODO clusters: create: @@ -61,8 +61,8 @@ tests: tester_imagestream_name: "llm-load-test" tester_image_tag: "wisdom-ci" test_namespace: "wisdom" - model_ver: "v11.4.4" #TODO use these - runtime_ver: "v0.27.0" #TODO use these + model_ver: "v11.4.4" # TODO use these + runtime_ver: "v0.27.0" # TODO use these s3_creds_model_secret_path: "/work/secrets/wisdom/s3-secret.yaml" quay_secret_path: "/work/secrets/wisdom/quay-secret.yaml" protos_path: "/work/secrets/wisdom-protos" diff --git a/testing/model-mesh/modelmesh.yaml b/testing/model-mesh/modelmesh.yaml index ae8f6b11af..82046b5895 100644 --- a/testing/model-mesh/modelmesh.yaml +++ b/testing/model-mesh/modelmesh.yaml @@ -25,4 +25,3 @@ spec: - name: manifests uri: https://github.com/opendatahub-io/odh-manifests/tarball/master version: master - diff --git a/testing/model-mesh/sample-minio-secret.yaml b/testing/model-mesh/sample-minio-secret.yaml index e4144f17cf..d63ff1b454 100644 --- a/testing/model-mesh/sample-minio-secret.yaml +++ b/testing/model-mesh/sample-minio-secret.yaml @@ -12,4 +12,3 @@ stringData: "default_bucket": "modelmesh-example-models", "region": "us-south" } - diff --git a/testing/model-mesh/sample-minio.yaml b/testing/model-mesh/sample-minio.yaml index 989e27f27a..1e7b3a66d2 100644 --- a/testing/model-mesh/sample-minio.yaml +++ b/testing/model-mesh/sample-minio.yaml @@ -28,7 +28,7 @@ spec: - /data1 env: - name: MINIO_ACCESS_KEY - value: THEACCESSKEY + value: THEACCESSKEY - name: MINIO_SECRET_KEY value: image: quay.io/opendatahub/modelmesh-minio-examples:v0.8.0 diff --git a/testing/notebooks/autoscaling/machineautoscaler.yaml b/testing/notebooks/autoscaling/machineautoscaler.yaml index cca014762b..f2bb636ba1 100644 --- a/testing/notebooks/autoscaling/machineautoscaler.yaml +++ b/testing/notebooks/autoscaling/machineautoscaler.yaml @@ -10,4 +10,3 @@ spec: apiVersion: machine.openshift.io/v1beta1 kind: MachineSet name: MACHINESET_NAME - diff --git a/testing/notebooks/config.yaml b/testing/notebooks/config.yaml index 92944d84c8..ba6c9126aa 100644 --- a/testing/notebooks/config.yaml +++ b/testing/notebooks/config.yaml @@ -51,10 +51,9 @@ ci_presets: clusters.create.type: ocp clusters.create.ocp.tags.Project: PSAP/RHODS/large_scale clusters.create.ocp.tags.TicketId: "85" - clusters.create.ocp.workers.count: 3 + clusters.create.ocp.workers.count: 4 clusters.create.ocp.workers.type: m6i.4xlarge clusters.create.ocp.compute.type: m6i.8xlarge - clusters.create.ocp.workers.count: 4 clusters.driver.compute.autoscaling.enabled: false clusters.sutest.compute.machineset.spot: true clusters.sutest.compute.autoscaling.enabled: true @@ -313,7 +312,7 @@ clusters: type: m6i.2xlarge cleanup: - max_age: 4 #hours + max_age: 4 # hours sutest: is_metal: false diff --git a/toolbox/ansible_default_config.py b/toolbox/ansible_default_config.py index e11814c508..ddce067401 100644 --- a/toolbox/ansible_default_config.py +++ b/toolbox/ansible_default_config.py @@ -40,15 +40,18 @@ def _generate_config(component): print(f"{component.__qualname__}\n- generating {dest} ...\n") with open(dest, "w") as f: - print("# Auto-generated file, do not edit manually ... ", file=f) + print("# Auto-generated file, do not edit manually ...", file=f) print(f"# Toolbox generate command: {' '.join(sys.argv[1:])}", file=f) print(f"# Source component: {component.__qualname__}", file=f) - print("", file=f) mapped_params = args_with_no_defaults + args_with_defaults \ if ansible_mapped_params else [] - for arg in mapped_params: + if len(mapped_params) > 0: + print("", file=f) + print("# Parameters", file=f) + + for i, arg in enumerate(mapped_params): try: description = args[arg].description except KeyError: @@ -69,16 +72,22 @@ def _generate_config(component): ansible_arg_name = f"{component.ansible_role}_{arg}" print(yaml.dump({ansible_arg_name: default_value}).strip() if default_value != "" \ else f"{ansible_arg_name}:", file=f) + if i < len(mapped_params)-1: + print("", file=f) + + if len(ansible_constants) > 0: print("", file=f) + print("# Constants", file=f) - for constant in ansible_constants: + for i, constant in enumerate(ansible_constants): if not constant["description"]: logging.error(f"Shouldn't generate a config file with an empty constant description :/ Is @AnsibleSkipConfigGeneration missing on {component.__qualname__}?") print(f"# {constant['description']}", file=f) print(f"# Defined as a constant in {component.__qualname__}", file=f) print(yaml.dump({f"{component.ansible_role}_{constant['name']}": constant["value"]}).strip(), file=f) - print("", file=f) + if i < len(ansible_constants)-1: + print("", file=f) def generate_all(group): for key in dir(group): diff --git a/visualizations/rhods-notebooks/data/reference_data/1.19.yaml b/visualizations/rhods-notebooks/data/reference_data/1.19.yaml index c590528af3..d37f2a5223 100644 --- a/visualizations/rhods-notebooks/data/reference_data/1.19.yaml +++ b/visualizations/rhods-notebooks/data/reference_data/1.19.yaml @@ -28,4 +28,4 @@ version: 1.19 run: 2 mode: scale_test - launcher: DSG \ No newline at end of file + launcher: DSG diff --git a/visualizations/rhods-notebooks/data/reference_data/notebook_performance.yaml b/visualizations/rhods-notebooks/data/reference_data/notebook_performance.yaml index ebbde4859b..06ceb1ed41 100644 --- a/visualizations/rhods-notebooks/data/reference_data/notebook_performance.yaml +++ b/visualizations/rhods-notebooks/data/reference_data/notebook_performance.yaml @@ -4,11 +4,11 @@ version: 1.16 mode: notebook_perf machine: m5a.2xlarge - benchmark_name : pyperf_bm_go.py - benchmark_number : 20 - benchmark_repeat : 5 - notebook_file_name : benchmark_entrypoint.ipynb - instance_type : m5.xlarge + benchmark_name: pyperf_bm_go.py + benchmark_number: 20 + benchmark_repeat: 5 + notebook_file_name: benchmark_entrypoint.ipynb + instance_type: m5.xlarge - url: https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/pr-logs/pull/openshift-psap_ci-artifacts/558/pull-ci-openshift-psap-ci-artifacts-main-ods-notebooks/1584559474750787584/artifacts/notebooks/test/artifacts/001_test_run/000__driver_rhods__notebook_ux_e2e_scale_test/ dest_dir: notebook_perf/1.17