Skip to content

Commit 96bec78

Browse files
committed
fix rerun job
1 parent 9b781ca commit 96bec78

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,14 @@ public Job rerun(Flow flow, Job job) {
272272

273273
// re-init job context
274274
Vars<String> context = job.getContext();
275-
for (String key : context.keySet()) {
275+
Iterator<Map.Entry<String, String>> iterator = context.entrySet().iterator();
276+
277+
while (iterator.hasNext()) {
278+
var key = iterator.next().getKey();
276279
if (PUSH_TAG_VARS.contains(key) || PR_VARS.contains(key) || Objects.equals(key, COMMIT_ID)) {
277280
continue;
278281
}
279-
context.remove(key);
282+
iterator.remove();
280283
}
281284

282285
initJobContext(job, flow, null);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ public class StepServiceImpl implements StepService {
5757

5858
@Override
5959
public void init(Job job) {
60+
jobStepCache.invalidate(job.getId());
61+
6062
NodeTree tree = ymlManager.getTree(job);
6163
List<Step> steps = new LinkedList<>();
6264

0 commit comments

Comments
 (0)