Merge pull request #207 from kopecmartin/tempest-cleanup

Add tempest cleanup opt

Author: openshift-merge-bot[bot]

api/bases/test.openstack.org_tempests.yaml

@@ -62,6 +62,12 @@ spec:
                   executions (defaults to 0).
                 format: int32
                 type: integer
+              cleanup:
+                default: false
+                description: Activate tempest cleanup. When activated, tempest will
+                  run tempest cleanup after test execution is complete to delete any
+                  resources created by tempest that may have been left out.
+                type: boolean
               configOverwrite:
                 additionalProperties:
                   type: string

api/v1beta1/tempest_types.go

@@ -394,6 +394,14 @@ type TempestSpec struct {
 	// This allows the user to debug any potential troubles with `oc rsh`.
 	Debug bool `json:"debug"`
 
+	// +kubebuilder:validation:Optional
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:default:=false
+	// Activate tempest cleanup. When activated, tempest will run tempest cleanup
+	// after test execution is complete to delete any resources created by tempest
+	// that may have been left out.
+	Cleanup bool `json:"cleanup"`
+
 	// +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

@@ -62,6 +62,12 @@ spec:
                   executions (defaults to 0).
                 format: int32
                 type: integer
+              cleanup:
+                default: false
+                description: Activate tempest cleanup. When activated, tempest will
+                  run tempest cleanup after test execution is complete to delete any
+                  resources created by tempest that may have been left out.
+                type: boolean
               configOverwrite:
                 additionalProperties:
                   type: string

controllers/tempest_controller.go

@@ -650,6 +650,7 @@ func (r *TempestReconciler) generateServiceConfigMaps(
 	r.setConfigOverwrite(customData, instance.Spec.ConfigOverwrite)
 
 	envVars["TEMPEST_DEBUG_MODE"] = r.GetDefaultBool(instance.Spec.Debug)
+	envVars["TEMPEST_CLEANUP"] = r.GetDefaultBool(instance.Spec.Cleanup)
 
 	cms := []util.Template{
 		// ConfigMap