Merge pull request #334 from openshift-cherrypick-robot/cherry-pick-330-to-18.0-fr3

[18.0-fr3] Add support for tempest re-run feature

Author: openshift-merge-bot[bot]

api/bases/test.openstack.org_tempests.yaml

@@ -1221,6 +1221,19 @@ spec:
                   needed for certain test-operator functionalities to work properly (e.g.:
                   extraRPMs in Tempest CR, or certain set of tobiko tests).
                 type: boolean
+              rerunFailedTests:
+                default: false
+                description: |-
+                  Activate tempest re-run feature. When activated, tempest will perform
+                  another run of the tests that failed during the first execution.
+                type: boolean
+              rerunOverrideStatus:
+                default: false
+                description: |-
+                  Allow override of exit status with the tempest re-run feature.
+                  When activated, the original return value of the tempest run will be
+                  overridden with a result of the tempest run on the set of failed tests.
+                type: boolean
               resources:
                 default:
                   limits:
@@ -1744,6 +1757,19 @@ spec:
                         functionalities to work properly (e.g.: extraRPMs in Tempest CR, or certain set
                         of tobiko tests).
                       type: boolean
+                    rerunFailedTests:
+                      default: false
+                      description: |-
+                        Activate tempest re-run feature. When activated, tempest will perform
+                        another run of the tests that failed during the first execution.
+                      type: boolean
+                    rerunOverrideStatus:
+                      default: false
+                      description: |-
+                        Allow override of exit status with the tempest re-run feature.
+                        When activated, the original return value of the tempest run will be
+                        overridden with a result of the tempest run on the set of failed tests.
+                      type: boolean
                     resources:
                       description: |-
                         The desired amount of resources that should be assigned to each test pod

api/v1beta1/tempest_types.go

@@ -409,6 +409,21 @@ type TempestSpec struct {
 	// that may have been left out.
 	Cleanup bool `json:"cleanup"`
 
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default:=false
+	// Activate tempest re-run feature. When activated, tempest will perform
+	// another run of the tests that failed during the first execution.
+	RerunFailedTests bool `json:"rerunFailedTests"`
+
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default:=false
+	// Allow override of exit status with the tempest re-run feature.
+	// When activated, the original return value of the tempest run will be
+	// overridden with a result of the tempest run on the set of failed tests.
+	RerunOverrideStatus bool `json:"rerunOverrideStatus"`
+
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose

api/v1beta1/tempest_types_workflow.go

@@ -249,6 +249,21 @@ type WorkflowTempestSpec struct {
 	// behaviour then set this option to true.
 	Parallel *bool `json:"parallel,omitempty"`
 
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default:=false
+	// Activate tempest re-run feature. When activated, tempest will perform
+	// another run of the tests that failed during the first execution.
+	RerunFailedTests bool `json:"rerunFailedTests"`
+
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default:=false
+	// Allow override of exit status with the tempest re-run feature.
+	// When activated, the original return value of the tempest run will be
+	// overridden with a result of the tempest run on the set of failed tests.
+	RerunOverrideStatus bool `json:"rerunOverrideStatus"`
+
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// NetworkAttachments is a list of NetworkAttachment resource names to expose

config/crd/bases/test.openstack.org_tempests.yaml

@@ -1221,6 +1221,19 @@ spec:
                   needed for certain test-operator functionalities to work properly (e.g.:
                   extraRPMs in Tempest CR, or certain set of tobiko tests).
                 type: boolean
+              rerunFailedTests:
+                default: false
+                description: |-
+                  Activate tempest re-run feature. When activated, tempest will perform
+                  another run of the tests that failed during the first execution.
+                type: boolean
+              rerunOverrideStatus:
+                default: false
+                description: |-
+                  Allow override of exit status with the tempest re-run feature.
+                  When activated, the original return value of the tempest run will be
+                  overridden with a result of the tempest run on the set of failed tests.
+                type: boolean
               resources:
                 default:
                   limits:
@@ -1744,6 +1757,19 @@ spec:
                         functionalities to work properly (e.g.: extraRPMs in Tempest CR, or certain set
                         of tobiko tests).
                       type: boolean
+                    rerunFailedTests:
+                      default: false
+                      description: |-
+                        Activate tempest re-run feature. When activated, tempest will perform
+                        another run of the tests that failed during the first execution.
+                      type: boolean
+                    rerunOverrideStatus:
+                      default: false
+                      description: |-
+                        Allow override of exit status with the tempest re-run feature.
+                        When activated, the original return value of the tempest run will be
+                        overridden with a result of the tempest run on the set of failed tests.
+                      type: boolean
                     resources:
                       description: |-
                         The desired amount of resources that should be assigned to each test pod

controllers/tempest_controller.go

@@ -591,6 +591,8 @@ func (r *TempestReconciler) generateServiceConfigMaps(
 
 	envVars["TEMPEST_DEBUG_MODE"] = r.GetDefaultBool(instance.Spec.Debug)
 	envVars["TEMPEST_CLEANUP"] = r.GetDefaultBool(instance.Spec.Cleanup)
+	envVars["TEMPEST_RERUN_FAILED_TESTS"] = r.GetDefaultBool(instance.Spec.RerunFailedTests)
+	envVars["TEMPEST_RERUN_OVERRIDE_STATUS"] = r.GetDefaultBool(instance.Spec.RerunOverrideStatus)
 
 	cms := []util.Template{
 		// ConfigMap