diff --git a/roles/test_operator/README.md b/roles/test_operator/README.md index 543c48f8c..32f7d46c7 100644 --- a/roles/test_operator/README.md +++ b/roles/test_operator/README.md @@ -146,8 +146,8 @@ Default value: {} ## Horizontest specific parameters -* `cifmw_test_operator_horizontest_admin_password`: (String) OpenStack admin credentials. Default value: `12345678` -* `cifmw_test_operator_horizontest_admin_username`: (String) OpenStack admin credentials. Default value: `admin` +* `cifmw_test_operator_horizontest_admin_password`: WARNING: This parameter will be deprecated! Credentials are now read from the `OpenStackConfigSecret` (`secure.yaml`). (String) OpenStack admin credentials. Default value: `` +* `cifmw_test_operator_horizontest_admin_username`: WARNING: This parameter will be deprecated! Credentials are now read from the `OpenStackConfigMap` (`clouds.yaml`). (String) OpenStack admin credentials. Default value: `` * `cifmw_test_operator_horizontest_auth_url`: (String) The OpenStack authentication URL. Default value: `https://keystone-public-openstack.apps.ocp.openstack.lab` * `cifmw_test_operator_horizontest_config`: (Dict) Definition of HorizonTest CR instance that is passed to the test-operator (see [the test-operator documentation](https://openstack-k8s-operators.github.io/test-operator/crds.html#horizontest-custom-resource)). Default value: See defaults in [main.yml](https://github.com/openstack-k8s-operators/ci-framework/blob/main/roles/test_operator/defaults/main.yml) * `cifmw_test_operator_horizontest_container`: (String) Name of the horizontest container. Default value: `openstack-horizontest` @@ -164,14 +164,11 @@ Default value: {} * `cifmw_test_operator_horizontest_logs_directory_name`: (String) The name of the directory to store test logs. Default value: `horizon` * `cifmw_test_operator_horizontest_name`: (String) Value used in the `Horizontest.Metadata.Name` field. The value specifies the name of some resources spawned by the test-operator role. Default value: `horizontest-tests` * `cifmw_test_operator_horizontest_namespace`: (String) Registry's namespace where to pull horizontest container. Default value: `{{ cifmw_test_operator_default_namespace }}` -* `cifmw_test_operator_horizontest_password`: (String) The password for the user running the Horizon tests. Default value: `horizontest` -* `cifmw_test_operator_horizontest_project_name`: (String) The name of the OpenStack project for Horizon tests. Default value: `horizontest` * `cifmw_test_operator_horizontest_project_name_xpath`: (String) The xpath to select project name based on dashboard theme. Default value: `//span[@class='rcueicon rcueicon-folder-open']/ancestor::li` * `cifmw_test_operator_horizontest_project_text_xpath`: (String) The xpath to element displaying current project based on dashboard theme. Default value: `.//span[@class='rcueicon rcueicon-folder-open']/ancestor::li` * `cifmw_test_operator_horizontest_registry`: (String) The registry where to pull horizontest container. Default value: `{{ cifmw_test_operator_default_registry }}` * `cifmw_test_operator_horizontest_repo_url`: (String) The Horizon tests repository URL. Default value: `https://review.opendev.org/openstack/horizon` * `cifmw_test_operator_horizontest_resources`: (Dict) A dictionary that specifies resources (cpu, memory) for the test pods. When kept untouched it defaults to the resource limits specified on the test-operator side. Default value: `{}` -* `cifmw_test_operator_horizontest_user`: (String) The username under which Horizon tests will run. Default value: `horizontest` ## Examples diff --git a/roles/test_operator/defaults/main.yml b/roles/test_operator/defaults/main.yml index 8ffb257f5..3a29ec29e 100644 --- a/roles/test_operator/defaults/main.yml +++ b/roles/test_operator/defaults/main.yml @@ -285,16 +285,11 @@ cifmw_test_operator_horizontest_namespace: "{{ cifmw_test_operator_default_names cifmw_test_operator_horizontest_container: openstack-horizontest cifmw_test_operator_horizontest_image: "{{ stage_vars_dict.cifmw_test_operator_horizontest_registry }}/{{ stage_vars_dict.cifmw_test_operator_horizontest_namespace }}/{{ stage_vars_dict.cifmw_test_operator_horizontest_container }}" cifmw_test_operator_horizontest_image_tag: "{{ cifmw_test_operator_default_image_tag }}" -cifmw_test_operator_horizontest_admin_username: admin -cifmw_test_operator_horizontest_admin_password: "12345678" cifmw_test_operator_horizontest_dashboard_url: "https://horizon-openstack.apps.ocp.openstack.lab/" cifmw_test_operator_horizontest_auth_url: "https://keystone-public-openstack.apps.ocp.openstack.lab" cifmw_test_operator_horizontest_repo_url: "https://review.opendev.org/openstack/horizon" cifmw_test_operator_horizontest_horizon_repo_branch: "master" cifmw_test_operator_horizontest_image_url: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img" -cifmw_test_operator_horizontest_project_name: "horizontest" -cifmw_test_operator_horizontest_user: "horizontest" -cifmw_test_operator_horizontest_password: "horizontest" cifmw_test_operator_horizontest_flavor_name: "m1.tiny" cifmw_test_operator_horizontest_logs_directory_name: "horizon" cifmw_test_operator_horizontest_debug: false @@ -320,9 +315,6 @@ cifmw_test_operator_horizontest_config: repoUrl: "{{ stage_vars_dict.cifmw_test_operator_horizontest_repo_url }}" horizonRepoBranch: "{{ stage_vars_dict.cifmw_test_operator_horizontest_horizon_repo_branch }}" imageUrl: "{{ stage_vars_dict.cifmw_test_operator_horizontest_image_url }}" - projectName: "{{ stage_vars_dict.cifmw_test_operator_horizontest_project_name }}" - user: "{{ stage_vars_dict.cifmw_test_operator_horizontest_user }}" - password: "{{ stage_vars_dict.cifmw_test_operator_horizontest_password }}" flavorName: "{{ stage_vars_dict.cifmw_test_operator_horizontest_flavor_name }}" logsDirectoryName: "{{ stage_vars_dict.cifmw_test_operator_horizontest_logs_directory_name }}" debug: "{{ stage_vars_dict.cifmw_test_operator_horizontest_debug }}"