chore(release): pre_release is incorrect

Author: jianxiaoguo

rootfs/api/models/app.py

@@ -255,6 +255,8 @@ def pipeline(self, release, force_deploy=False, rollback_on_failure=True):
         except Exception as e:
             release.state = "crashed"
             release.failed = True
+            if release.summary:
+                release.summary += " "
             release.summary += "{} pipeline a release that failed".format(self.owner)
             release.exception = "error: {}".format(str(e))
             self.log(f"{prefix} pipeline runtime error: {release.exception}", logging.ERROR)

rootfs/api/models/build.py

@@ -90,6 +90,8 @@ def create_release(self, user, *args, **kwargs):
                 new_release = self.app.release_set.latest()
                 new_release.state = "crashed"
                 new_release.failed = True
+                if new_release.summary:
+                    new_release.summary += " "
                 new_release.summary += "{} deployed {} which failed".format(
                     self.owner, str(self.uuid)[:7])
                 # Get the exception that has occured

rootfs/api/models/release.py

@@ -185,7 +185,7 @@ def previous(self):
 
         try:
             # Get the Release previous to this one
-            prev_release = releases.filter(failed=False).latest()
+            prev_release = releases.filter(failed=False, state="succeed").latest()
         except Release.DoesNotExist:
             prev_release = None
         return prev_release
@@ -223,6 +223,8 @@ def rollback(self, user, version=None):
                 new_release = self.app.release_set.latest()
                 new_release.state = "crashed"
                 new_release.failed = True
+                if new_release.summary:
+                    new_release.summary += " "
                 new_release.summary += "{} performed roll back to a release that failed".format(
                     self.owner)
                 # Get the exception that has occured

rootfs/api/tests/test_release.py

@@ -638,7 +638,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertIsNone(release.diff_procfile_types())
         # test has image
@@ -669,7 +670,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'web', 'worker'})
         # test has image
@@ -700,7 +702,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'web'})
         # test has image
@@ -731,7 +734,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'worker'})
         # test no image
@@ -771,7 +775,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'web', 'worker', 'worker-sync'})
         # test has image
@@ -805,7 +810,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'worker', 'task', 'worker-sync', 'web'})
         # test has image
@@ -839,7 +845,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), {'task'})
         # test has image
@@ -873,7 +880,8 @@ def test_diff_procfile_types(self, mock_requests):
             owner=user,
             app=app,
             config=app.config_set.latest(),
-            build=build
+            build=build,
+            state="succeed"
         )
         self.assertEqual(release.diff_procfile_types(), set())
         with mock.patch('scheduler.resources.pod.Pod.watch') as mock_kube:

rootfs/api/views.py

@@ -415,6 +415,8 @@ def post_save(self, config):
             if 'release' in locals():
                 release.state = "crashed"
                 release.failed = True
+                if release.summary:
+                    release.summary += " "
                 release.summary += "{} deployed a config that failed".format(self.request.user)
                 # Get the exception that has occured
                 release.exception = "error: {}".format(str(e))