Reorganize kuttl tests for nova-cell-deletion

controllers/nova_controller.go

@@ -763,12 +763,6 @@ func (r *NovaReconciler) ensureCellDeleted(
 		return err
 	}
 
-	// Delete secrets
-	dbSecret := fmt.Sprintf("%s-db-secret", cell.Name)
-	err = secret.DeleteSecretsWithName(ctx, h, dbSecret, instance.Namespace)
-	if err != nil {
-		return err
-	}
 	secretName := getNovaCellCRName(instance.Name, cellName)
 	err = secret.DeleteSecretsWithName(ctx, h, secretName, instance.Namespace)
 	if err != nil {
@@ -784,6 +778,10 @@ func (r *NovaReconciler) ensureCellDeleted(
 	}
 	err = r.Client.Delete(ctx, transportURL)
 
+	if err != nil {
+		return err
+	}
+
 	err = DeleteDatabaseAndAccountFinalizers(ctx, h, dbName, accountName, instance.ObjectMeta.Namespace)
 
 	if err != nil {

test/kuttl/test-suites/default/tests/02-assert.yaml → test/kuttl/test-suites/default/cell-tests/02-assert.yaml

@@ -119,7 +119,10 @@ status:
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-namespaced: true
 commands:
-  - command: echo oc get -n $NAMESPACE pod/nova-kuttl-cell1-novncproxy-0 --ignore-not-found
-  - command: echo oc get -n $NAMESPACE pod/nova-kuttl-cell1-conductor-0--ignore-not-found
+  - script: |
+      oc get -n nova-kuttl-default pod/nova-kuttl-cell1-novncproxy-0 || exit 0
+      exit 1
+  - script: |
+      oc get -n nova-kuttl-default pod/nova-kuttl-cell1-conductor-0 || exit 0
+      exit 1