Merge ~ltrager/maas:lp1751946_2.3 into maas:2.3

[Lee Trager]

LP: #1751946 - Only cleanup ScriptSets of the same type.

Backport 1f9751aec9041dc079b83db4e9e81485cd188ef6 from master

[Lee Trager (ltrager)]

Approved in https://code.launchpad.net/~ltrager/maas/+git/maas/+merge/340074

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1751946_2.3 lp:~ltrager/maas/+git/maas into -b 2.3 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/1821/consoleText

diff --git a/src/metadataserver/models/scriptset.py b/src/metadataserver/models/scriptset.py
index e3943bb..7179f2d 100644
--- a/src/metadataserver/models/scriptset.py
+++ b/src/metadataserver/models/scriptset.py
@@ -253,6 +253,7 @@ class ScriptSetManager(Manager):
         # it is not associated with any disk. Check for this case and clean it
         # up when trying commissioning again.
         for script_result in ScriptResult.objects.filter(
+                script_set__result_type=new_script_set.result_type,
                 script_set__node=node).exclude(parameters={}).exclude(
                     script_set=new_script_set):
             for param in script_result.parameters.values():
diff --git a/src/metadataserver/models/tests/test_scriptset.py b/src/metadataserver/models/tests/test_scriptset.py
index a964fe2..bea3c77 100644
--- a/src/metadataserver/models/tests/test_scriptset.py
+++ b/src/metadataserver/models/tests/test_scriptset.py
@@ -16,6 +16,7 @@ from maasserver.models import (
     Config,
     Event,
     EventType,
+    Node,
 )
 from maasserver.preseed import CURTIN_INSTALL_LOG
 from maasserver.testing.factory import factory
@@ -246,6 +247,28 @@ class TestScriptSetManager(MAASServerTestCase):
                 1,
                 ScriptResult.objects.filter(script_name=script_name).count())
 
+    def test_create_commissioning_script_set_only_cleans_same_type(self):
+        # Regression test for LP:1751946
+        node = Node.objects.create()
+        script_set = ScriptSet.objects.create_commissioning_script_set(
+            node=node)
+        script_set.scriptresult_set.update(status=SCRIPT_STATUS.ABORTED)
+        node.current_commissioning_script_set = script_set
+        script = factory.make_Script(
+            script_type=SCRIPT_TYPE.TESTING,
+            parameters={'storage': {'type': 'storage'}})
+        testing_script_set = ScriptSet.objects.create_testing_script_set(
+            node=node, scripts=[script.id])
+        testing_script_set.scriptresult_set.update(
+            status=SCRIPT_STATUS.ABORTED)
+        node.current_testing_script_set = testing_script_set
+        node.save()
+        new_script_set = ScriptSet.objects.create_commissioning_script_set(
+            node=node)
+        node.current_commissioning_script_set = new_script_set
+        node.save()
+        self.assertIsNotNone(ScriptSet.objects.get(id=testing_script_set.id))
+
     def test_create_commissioning_script_set_removes_previous_placeholder(
             self):
         # Regression test for LP:1731075