0001-fix-orchestration.patch

Robert Haschke, 2020-01-25 04:31

Download (2.378 KB)

View differences:

templates/ci-deploy/orchestration.template
55 55

  
56 56
    def popBuild() {
57 57
      done = running.find { build -> build.isDone() }
58
      if (done) {
58
      if (done && !done.isCancelled()) {
59 59
        running.remove(done)
60 60
        return done.get()
61 61
      }
templates/ci/orchestration.template
70 70

  
71 71
    def popBuild() {
72 72
      done = running.find { build -> build.isDone() }
73
      if (done) {
73
      if (done && !done.isCancelled()) {
74 74
        running.remove(done)
75 75
        return done.get()
76 76
      }
templates/citk/orchestration.template
78 78

  
79 79
    def popBuild() {
80 80
      done = running.find { build -> build.isDone() }
81
      if (done) {
81
      if (done && !done.isCancelled()) {
82 82
        running.remove(done)
83 83
        return done.get()
84 84
      }
templates/toolkit/orchestration.template
69 69

  
70 70
    def popBuild() {
71 71
      done = running.find { build -> build.isDone() }
72
      if (done) {
72
      if (done && !done.isCancelled()) {
73 73
        running.remove(done)
74 74
        return done.get()
75 75
      }
76
-