Skip to content

Add parameter for HorizonTest #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HanzJas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add parameter for HorizonTest #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions api/bases/test.openstack.org_horizontests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,12 @@ spec:
ProjectNameXpath is the xpath to select project name
on the horizon dashboard based on the u/s or d/s theme
type: string
projectTextXpath:
description: |-
ProjectTextXpath is the xpath to element displaying
current project name on the horizon dashboard based
on the u/s or d/s theme
type: string
repoUrl:
default: https://review.opendev.org/openstack/horizon
description: RepoUrl is the URL of the Horizon repository.
Expand Down
7 changes: 7 additions & 0 deletions api/v1beta1/horizontest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ type HorizonTestSpec struct {
// on the horizon dashboard based on the u/s or d/s theme
ProjectNameXpath string `json:"projectNameXpath"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// ProjectTextXpath is the xpath to element displaying
// current project name on the horizon dashboard based
// on the u/s or d/s theme
ProjectTextXpath string `json:"projectTextXpath"`

// +kubebuilder:validation:Required
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=253
Expand Down
6 changes: 6 additions & 0 deletions config/crd/bases/test.openstack.org_horizontests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,12 @@ spec:
ProjectNameXpath is the xpath to select project name
on the horizon dashboard based on the u/s or d/s theme
type: string
projectTextXpath:
description: |-
ProjectTextXpath is the xpath to element displaying
current project name on the horizon dashboard based
on the u/s or d/s theme
type: string
repoUrl:
default: https://review.opendev.org/openstack/horizon
description: RepoUrl is the URL of the Horizon repository.
Expand Down
3 changes: 3 additions & 0 deletions config/samples/test_v1beta1_horizontest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ spec:
# ProjectNameXpath is the xpath to select project name on dashboard (optional)
projectNameXpath: "//span[@class='rcueicon rcueicon-folder-open']/ancestor::li"

# ProjectTextXpath is the xpath to element displaying current project (optional)
projectTextXpath: ".//span[@class='rcueicon rcueicon-folder-open']/ancestor::li"

# Privileged
# ----------
#
Expand Down
1 change: 1 addition & 0 deletions internal/controller/horizontest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ func (r *HorizonTestReconciler) PrepareHorizonTestEnvVars(
"HORIZON_KEYS_FOLDER": "/etc/test_operator",
"EXTRA_FLAG": instance.Spec.ExtraFlag,
"PROJECT_NAME_XPATH": instance.Spec.ProjectNameXpath,
"PROJECT_TEXT_XPATH": instance.Spec.ProjectTextXpath,
})

return envVars
Expand Down
1 change: 1 addition & 0 deletions zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
cifmw_test_operator_horizontest_dashboard_url: "https://horizon-openstack.apps-crc.testing/"
cifmw_test_operator_horizontest_extra_flag: "not pagination and test_users.py"
cifmw_test_operator_horizontest_project_name_xpath: //*[@class="context-project"]//ancestor::ul
cifmw_test_operator_horizontest_project_text_xpath: './/*[@class="context-project"]'
cifmw_test_operator_horizontest_extra_mounts:
- name: v1
region: r1
Expand Down
Loading