Skip to content

Commit

Permalink
revert defaultconfig accidental changes
Browse files Browse the repository at this point in the history
Signed-off-by: Aviadp <[email protected]>
  • Loading branch information
AviadP committed Jan 8, 2025
1 parent 2eea5cd commit 80f3a98
Showing 1 changed file with 46 additions and 38 deletions.
84 changes: 46 additions & 38 deletions ocs_ci/framework/conf/default_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@

# in this RUN section we will keep default parameters for run of OCS-CI
RUN:
username: "kubeadmin"
password_location: "auth/kubeadmin-password"
username: 'kubeadmin'
password_location: 'auth/kubeadmin-password'
log_dir: "/tmp"
run_id: null # this will be redefined in the execution
kubeconfig_location: "auth/kubeconfig" # relative from cluster_dir
cli_params: {} # this will be filled with CLI parameters data
run_id: null # this will be redefined in the execution
kubeconfig_location: 'auth/kubeconfig' # relative from cluster_dir
cli_params: {} # this will be filled with CLI parameters data
# If the client version ends with .nightly, the version will be exposed
# to the latest accepted OCP nightly build version
client_version: "4.18.0-0.nightly"
bin_dir: "./bin"
google_api_secret: "~/.ocs-ci/google_api_secret.json"
client_version: '4.18.0-0.nightly'
bin_dir: './bin'
google_api_secret: '~/.ocs-ci/google_api_secret.json'
# Following chrome params are for openshift console UI testing
force_chrome_branch_base: "665006"
force_chrome_branch_sha256sum: "a1ae2e0950828f991119825f62c24464ab3765aa219d150a94fb782a4c66a744"
Expand All @@ -39,6 +39,7 @@ RUN:
skipped_on_ceph_health_ratio: 0
skipped_on_ceph_health_threshold: 0


# In this section we are storing all deployment related configuration but not
# the environment related data as those are defined in ENV_DATA section.
DEPLOYMENT:
Expand All @@ -52,7 +53,7 @@ DEPLOYMENT:
force_download_installer: True
force_download_client: True
skip_download_client: False
default_latest_tag: "latest-stable-4.18"
default_latest_tag: 'latest-stable-4.18'
# define if ceph is setup as external mode, default is false
external_mode: False
# You can overwrite csv channel version by following parameter
Expand Down Expand Up @@ -107,8 +108,8 @@ DEPLOYMENT:
ingress_ssl_cert: "data/ingress-cert.crt"
ingress_ssl_key: "data/ingress-cert.key"
ingress_ssl_ca_cert: "data/ca.crt"
custom_ssl_cert_provider: "ocs-qe-ca"
certbot_dns_plugin: "dns-route53"
custom_ssl_cert_provider: 'ocs-qe-ca'
certbot_dns_plugin: 'dns-route53'
api_ssl_cert: "data/api-cert.crt"
api_ssl_key: "data/api-cert.key"
api_ssl_ca_cert: "data/ca.crt"
Expand All @@ -118,8 +119,10 @@ DEPLOYMENT:
aws_cred_path: "~/.aws/credentials"
# STS in CCO manual mode
sts_enabled: false
ocm_cli_version: "0.1.75"
rosa_cli_version: "1.2.45"
ocm_cli_version: '0.1.75'
rosa_cli_version: '1.2.45'



# Section for reporting configuration
REPORTING:
Expand All @@ -129,48 +132,48 @@ REPORTING:
polarion:
project_id: "OpenShiftContainerStorage"
# Upstream: 'US' or Downstream: 'DS', used only for reporting (Test Run Name)
us_ds: "DS"
us_ds: 'DS'
ocp_must_gather_image: "quay.io/openshift/origin-must-gather"
default_ocs_must_gather_image: "quay.io/rhceph-dev/ocs-must-gather"
odf_live_must_gather_image: "registry.redhat.io/odf4/odf-must-gather-rhel9"
odf_live_must_gather_image_pre_4_13: "registry.redhat.io/odf4/ocs-must-gather-rhel8"
default_ocs_must_gather_latest_tag: "latest-4.18"
default_ocs_must_gather_latest_tag: 'latest-4.18'
gather_on_deploy_failure: true
collect_logs_on_success_run: False
rp_client_log_level: "ERROR"

# This is the default information about environment.
ENV_DATA:
cluster_name: null # will be changed in ocscilib plugin
storage_cluster_name: "ocs-storagecluster"
cluster_name: null # will be changed in ocscilib plugin
storage_cluster_name: 'ocs-storagecluster'
storage_client_name: "storage-client"
storage_device_sets_name: "storageDeviceSets"
sno: false
cluster_namespace: "openshift-storage"
client_namespace: "openshift-storage-client"
service_namespace: "openshift-storage"
local_storage_namespace: "openshift-local-storage"
cluster_namespace: 'openshift-storage'
client_namespace: 'openshift-storage-client'
service_namespace: 'openshift-storage'
local_storage_namespace: 'openshift-local-storage'
monitoring_enabled: true
persistent-monitoring: true
platform: "AWS"
deployment_type: "ipi"
region: "us-east-2"
base_domain: "qe.rh-ocs.com"
master_instance_type: "m6i.xlarge"
worker_instance_type: "m5.4xlarge"
platform: 'AWS'
deployment_type: 'ipi'
region: 'us-east-2'
base_domain: 'qe.rh-ocs.com'
master_instance_type: 'm6i.xlarge'
worker_instance_type: 'm5.4xlarge'
# vm_type_bootstrap is used in AWS UPI deployments
vm_type_bootstrap: "i3.large"
vm_type_bootstrap: 'i3.large'
master_replicas: 3
worker_replicas: 3
skip_ocp_deployment: false
skip_ocs_deployment: false
ocs_version: "4.18"
ocs_version: '4.18'
prometheus_version: "4.10.0"
# uncomment to use custom directory for storing measurement data related to
# monitoring tests, otherwise generate temporary directory for each test run
# measurement_dir: '/tmp/ocs_ci_monitoring_measurement/'
# Default RHCOS image to be used for VmWare deployment
vm_template: "rhcos-418.94.202410090804-0-vmware.x86_64"
vm_template: 'rhcos-418.94.202410090804-0-vmware.x86_64'
# minimal write speed of fio as used in workload_fio_storageutilization
# fixtures, which is used to compute timeout of the write job (so that
# when actual write speed of the operation is smaller than this value, the
Expand All @@ -195,7 +198,7 @@ ENV_DATA:
# The disk UUID on the VMs must be enabled, `disk.EnableUUID` value must be set to `True`.
# This step is necessary so that the VMDK always presents a consistent UUID
# to the VM, thus allowing the disk to be mounted properly.
disk_enable_uuid: "TRUE"
disk_enable_uuid: 'TRUE'
# Encoding type for the ignition config
ignition_data_encoding: base64
# opm tool github owner and repository (used in api url for downloading opm tool)
Expand Down Expand Up @@ -223,21 +226,21 @@ ENV_DATA:
rhel_version: "8.4"
# This RHEL version will be used for running ansible playbook for adding RHEL nodes
rhel_version_for_ansible: 8
rhel7.9_worker_ami: "ami-058a93d58c5797698"
rhel8.4_worker_ami: "ami-074bab065c112399f"
rhel7.9_worker_ami: 'ami-058a93d58c5797698'
rhel8.4_worker_ami: 'ami-074bab065c112399f'
cluster_type: ""

# RHEL template which are used for vSphere platform
rhel7_template: "rhel79_ocs4qe"
rhel8_template: "rhel87_ocs4qe"
rhel7_template: 'rhel79_ocs4qe'
rhel8_template: 'rhel87_ocs4qe'
# ACM HUB deployment
deploy_acm_hub_cluster: false

# Managed service git stat default configurations
# Managed StorageCluster size in TiB
size: "20"
ms_env_type: "staging"
rosa_billing_model: "standard"
size: '20'
ms_env_type: 'staging'
rosa_billing_model: 'standard'
appliance_mode: true
ms_osd_pod_memory: "6Gi"
ms_osd_pod_cpu: "1650m"
Expand Down Expand Up @@ -313,6 +316,7 @@ EXTERNAL_MODE:
key: PLACE_HOLDER
run_as_user: "client.healthchecker"


# This section is related to ui testing with selenium
UI_SELENIUM:
browser_type: "chrome"
Expand Down Expand Up @@ -358,3 +362,7 @@ MULTICLUSTER:
acm_cluster: False
primary_cluster: False
active_acm_cluster: False

PREUPGRADE_CONFIG:
AUTH: null
MULTICLUSTER: null

0 comments on commit 80f3a98

Please sign in to comment.