Add tempest options

This patch introduces a set of parameters for the tempestRun section in the Tempest CR. This field parameters allow a user to specify parameters with which tempest command should be executed inside the Tempest pod. The documentation is updated as well so that it demonstrates how the new field should be utilized.
openstack-k8s-operators · Nov 10, 2023 · abfc40c · abfc40c
1 parent 8c6bcd2
commit abfc40c
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 106 deletions.
diff --git a/api/bases/test.openstack.org_tempests.yaml b/api/bases/test.openstack.org_tempests.yaml
@@ -112,25 +112,34 @@ spec:
               tempestRun:
                 description: TempestSpec TempestRun parts
                 properties:
-                  allowedTests:
-                    default:
-                    - tempest.api.identity.v3
-                    description: AllowedTests
-                    items:
-                      type: string
-                    type: array
                   concurrency:
                     default: -1
                     description: Concurrency is the Default concurrency
                     format: int64
                     type: integer
-                  skippedTests:
-                    description: SkippedTests
-                    items:
-                      type: string
-                    type: array
+                  excludeList:
+                    default: ""
+                    description: ExcludeList
+                    type: string
+                  includeList:
+                    default: tempest.api.identity.v3
+                    description: IncludeList
+                    type: string
+                  parallel:
+                    default: true
+                    description: Run tests in parallel
+                    type: boolean
+                  serial:
+                    default: false
+                    description: Serial run
+                    type: boolean
+                  smoke:
+                    default: false
+                    description: Smoke tests
+                    type: boolean
                   workerFile:
-                    description: WorkerFile is the detailed concurry spec file
+                    default: ""
+                    description: WorkerFile is the detailed concurrency spec file
                     type: string
                 type: object
               tempestconfRun:
@@ -210,7 +219,7 @@ spec:
                     description: Output file
                     type: string
                   overrides:
-                    default: ""
+                    default: identity.v3_endpoint_type public
                     description: Override options
                     type: string
                   profile:

diff --git a/api/v1beta1/tempest_types.go b/api/v1beta1/tempest_types.go
@@ -38,21 +38,38 @@ type Hash struct {
 // TempestSpec TempestRun parts
 type TempestRunSpec struct {
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={"tempest.api.identity.v3"}
-	// AllowedTests
-	AllowedTests []string `json:"allowedTests,omitempty"`
+	// +kubebuilder:default="tempest.api.identity.v3"
+	// IncludeList
+	IncludeList string `json:"includeList,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// SkippedTests
-	SkippedTests []string `json:"skippedTests,omitempty"`
+	// +kubebuilder:default=""
+	// ExcludeList
+	ExcludeList string `json:"excludeList,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:=-1
 	// Concurrency is the Default concurrency
 	Concurrency int64 `json:"concurrency,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// WorkerFile is the detailed concurry spec file
+	// +kubebuilder:default:=false
+	// Smoke tests
+	Smoke bool `json:"smoke,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:=true
+	// Run tests in parallel
+	Parallel bool `json:"parallel,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:=false
+	// Serial run
+	Serial bool `json:"serial,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:=""
+	// WorkerFile is the detailed concurrency spec file
 	WorkerFile string `json:"workerFile,omitempty"`
 }
 
@@ -169,7 +186,7 @@ type TempestconfRunSpec struct {
 	Remove string `json:"remove"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=""
+	// +kubebuilder:default="identity.v3_endpoint_type public"
 	// Override options
 	Overrides string `json:"overrides"`
 

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/test.openstack.org_tempests.yaml b/config/crd/bases/test.openstack.org_tempests.yaml
@@ -112,25 +112,34 @@ spec:
               tempestRun:
                 description: TempestSpec TempestRun parts
                 properties:
-                  allowedTests:
-                    default:
-                    - tempest.api.identity.v3
-                    description: AllowedTests
-                    items:
-                      type: string
-                    type: array
                   concurrency:
                     default: -1
                     description: Concurrency is the Default concurrency
                     format: int64
                     type: integer
-                  skippedTests:
-                    description: SkippedTests
-                    items:
-                      type: string
-                    type: array
+                  excludeList:
+                    default: ""
+                    description: ExcludeList
+                    type: string
+                  includeList:
+                    default: tempest.api.identity.v3
+                    description: IncludeList
+                    type: string
+                  parallel:
+                    default: true
+                    description: Run tests in parallel
+                    type: boolean
+                  serial:
+                    default: false
+                    description: Serial run
+                    type: boolean
+                  smoke:
+                    default: false
+                    description: Smoke tests
+                    type: boolean
                   workerFile:
-                    description: WorkerFile is the detailed concurry spec file
+                    default: ""
+                    description: WorkerFile is the detailed concurrency spec file
                     type: string
                 type: object
               tempestconfRun:
@@ -210,7 +219,7 @@ spec:
                     description: Output file
                     type: string
                   overrides:
-                    default: ""
+                    default: identity.v3_endpoint_type public
                     description: Override options
                     type: string
                   profile:

diff --git a/config/samples/test_v1beta1_tempest.yaml b/config/samples/test_v1beta1_tempest.yaml
@@ -7,10 +7,23 @@ metadata:
 spec:
   containerImage: quay.io/podified-antelope-centos9/openstack-tempest:current-podified
   tempestRun:
-    allowedTests:
-      - tempest.api.identity.v3.*
+    # NOTE: All parameters have default values (use only when you want to override
+    #       the default behaviour)
+    includeList: | # <-- Use | to preserve \n
+      tempest.api.identity.v3.*
     concurrency: 8
-  pythonTempestconfRun:
+    # excludeList:
+    # - tempest.api.identity.v3.*
+    # workerFile: | # <-- use | to preserver \n
+    #   - worker:
+    #     - tempest.api.*
+    #     - neutron_tempest_tests
+    #   - worker:
+    #     - tempest.scenario.*
+    # smoke: false
+    # serial: false
+    # parallel: true
+  tempestconfRun:
     # NOTE: All parameters have default values (use only when you want to override
     #       the default behaviour)
     # create: true