[tempest] Remove neutronExtraImage parameter (#100)

With the merge of this PR in the ci-framework repo [1] we officialy
remove the support for the neutornExtraImage. This parameter can be
safely removed now.

[1] openstack-k8s-operators/ci-framework#1790

Depends-On: openstack-k8s-operators/ci-framework#1790

Author: lpiwowar

api/bases/test.openstack.org_tempests.yaml

@@ -216,10 +216,6 @@ spec:
                     description: A content of include.txt file that is passed to tempest
                       via --include-list
                     type: string
-                  neutronExtraImage:
-                    default: ""
-                    description: Add extra image for Neutron Tempest plugin
-                    type: string
                   parallel:
                     default: true
                     description: Indicate whether tempest should be executed with
@@ -602,9 +598,6 @@ spec:
                           description: A content of include.txt file that is passed
                             to tempest via --include-list
                           type: string
-                        neutronExtraImage:
-                          description: Add extra image for Neutron Tempest plugin
-                          type: string
                         parallel:
                           description: Indicate whether tempest should be executed
                             with --parallel

api/v1beta1/tempest_types.go

@@ -169,11 +169,6 @@ type TempestRunSpec struct {
 	// that are part of the external plugin can be executed.
 	ExternalPlugin []ExternalPluginType `json:"externalPlugin,omitempty"`
 
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:=""
-	// Add extra image for Neutron Tempest plugin
-	NeutronExtraImage string `json:"neutronExtraImage,omitempty"`
-
 	// +kubebuilder:validation:Optional
 	// Extra images that should be downloaded inside the test pod and uploaded to
 	// openstack.

api/v1beta1/tempest_types_workflow.go

@@ -62,10 +62,6 @@ type WorkflowTempestRunSpec struct {
 	// Extra images that should be downloaded inside the test pod and uploaded to
 	// openstack.
 	ExtraImages *[]ExtraImagesType `json:"extraImagesType"`
-
-	// +kubebuilder:validation:Optional
-	// Add extra image for Neutron Tempest plugin
-	NeutronExtraImage *string `json:"neutronExtraImage,omitempty"`
 }
 
 // TempestconfRunSpec - is used to configure execution of discover-tempest-config

api/v1beta1/zz_generated.deepcopy.go

@@ -216,10 +216,6 @@ spec:
                     description: A content of include.txt file that is passed to tempest
                       via --include-list
                     type: string
-                  neutronExtraImage:
-                    default: ""
-                    description: Add extra image for Neutron Tempest plugin
-                    type: string
                   parallel:
                     default: true
                     description: Indicate whether tempest should be executed with
@@ -602,9 +598,6 @@ spec:
                           description: A content of include.txt file that is passed
                             to tempest via --include-list
                           type: string
-                        neutronExtraImage:
-                          description: Add extra image for Neutron Tempest plugin
-                          type: string
                         parallel:
                           description: Indicate whether tempest should be executed
                             with --parallel

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

@@ -444,12 +444,6 @@ func (r *TempestReconciler) setTempestConfigVars(envVars map[string]string,
 
 	envVars["TEMPEST_WORKFLOW_STEP_DIR_NAME"] = r.GetJobName(instance, workflowStepNum)
 
-	// String
-	value = mergeWithWorkflow(tRun.NeutronExtraImage, wtRun.NeutronExtraImage)
-	if len(value) != 0 {
-		envVars["TEMPEST_NEUTRON_IMAGE_URL"] = value
-	}
-
 	extraImages := mergeWithWorkflow(tRun.ExtraImages, wtRun.ExtraImages)
 	for _, extraImageDict := range extraImages {
 		envVars["TEMPEST_EXTRA_IMAGES_URL"] += extraImageDict.URL + ","