keep pathset related vars on job rerun

Author: gy2006

core/src/main/java/com/flowci/core/common/domain/Variables.java

@@ -192,7 +192,7 @@ public abstract static class Git {
         public static final String PATCHSET_INSERT_SIZE = "FLOWCI_GIT_PATCHSET_INSERT_SIZE";
         public static final String PATCHSET_DELETE_SIZE = "FLOWCI_GIT_PATCHSET_DELETE_SIZE";
         public static final String PATCHSET_AUTHOR = "FLOWCI_GIT_PATCHSET_AUTHOR";
-        public static final Collection<String> PATCH_VARS = ImmutableList.<String>builder()
+        public static final Collection<String> PATCHSET_VARS = ImmutableList.<String>builder()
                 .add(PATCHSET_SUBJECT)
                 .add(PATCHSET_MESSAGE)
                 .add(PATCHSET_PROJECT)

core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java

@@ -265,7 +265,6 @@ public Job rerun(Flow flow, Job job) {
         job.setStartAt(null);
         job.setSnapshots(Maps.newHashMap());
         job.setStatus(Job.Status.PENDING);
-        job.setTrigger(Trigger.MANUAL);
         job.resetCurrentPath();
         job.setPriority(Job.MaxPriority);
         job.setCreatedBy(sessionManager.getUserEmail());
@@ -276,9 +275,23 @@ public Job rerun(Flow flow, Job job) {
 
         while (iterator.hasNext()) {
             var key = iterator.next().getKey();
-            if (PUSH_TAG_VARS.contains(key) || PR_VARS.contains(key) || Objects.equals(key, COMMIT_ID)) {
+
+            if (PUSH_TAG_VARS.contains(key)) {
+                continue;
+            }
+
+            if (PR_VARS.contains(key)) {
+                continue;
+            }
+
+            if (PATCHSET_VARS.contains(key)) {
+                continue;
+            }
+
+            if (Objects.equals(key, COMMIT_ID)) {
                 continue;
             }
+
             iterator.remove();
         }