fix(hatchery/marathon): let hatchery remove worker (#5189)

Author: yesnault

docs/content/docs/tutorials/worker_model-vsphere.md

@@ -52,7 +52,6 @@ We will create a worker model called debian8-docker:
    set +e
    export CDS_FROM_WORKER_IMAGE={{.FromWorkerImage}}
    export CDS_SINGLE_USE=1
-   export CDS_FORCE_EXIT=1
    export CDS_API={{.API}}
    export CDS_TOKEN={{.Token}}
    export CDS_NAME={{.Name}}

engine/api/workermodel/init.go

@@ -21,7 +21,6 @@ func insertFirstPatterns(db gorp.SqlExecutor) error {
 set +e
 export CDS_FROM_WORKER_IMAGE={{.FromWorkerImage}}
 export CDS_SINGLE_USE=1
-export CDS_FORCE_EXIT=1
 export CDS_API={{.API}}
 export CDS_TOKEN={{.Token}}
 export CDS_NAME={{.Name}}

engine/hatchery/kubernetes/kubernetes.go

@@ -299,7 +299,6 @@ func (h *HatcheryKubernetes) SpawnWorker(ctx context.Context, spawnArgs hatchery
 		spawnArgs.Model.ModelDocker.Envs = map[string]string{}
 	}
 	envsWm := map[string]string{}
-	envsWm["CDS_FORCE_EXIT"] = "1"
 	envsWm["CDS_MODEL_MEMORY"] = fmt.Sprintf("%d", memory)
 	envsWm["CDS_API"] = udataParam.API
 	envsWm["CDS_TOKEN"] = udataParam.Token

engine/hatchery/marathon/marathon.go

@@ -249,6 +249,8 @@ func (h *HatcheryMarathon) SpawnWorker(ctx context.Context, spawnArgs hatchery.S
 		memory = hatchery.MemoryRegisterContainer
 	}
 
+	cmd += "; sleep 120" // sleep 2min, to let marathon hatchery remove the container
+
 	//Check if there is a memory requirement
 	//if there is a service requirement: exit
 	if spawnArgs.JobID > 0 {
@@ -271,7 +273,6 @@ func (h *HatcheryMarathon) SpawnWorker(ctx context.Context, spawnArgs hatchery.S
 	}
 
 	envsWm := map[string]string{}
-	envsWm["CDS_FORCE_EXIT"] = "0"
 	envsWm["CDS_MODEL_MEMORY"] = fmt.Sprintf("%d", memory)
 	envsWm["CDS_API"] = udataParam.API
 	envsWm["CDS_TOKEN"] = udataParam.Token

engine/hatchery/swarm/swarm.go

@@ -393,7 +393,6 @@ func (h *HatcherySwarm) SpawnWorker(ctx context.Context, spawnArgs hatchery.Spaw
 	}
 
 	envsWm := map[string]string{}
-	envsWm["CDS_FORCE_EXIT"] = "1"
 	envsWm["CDS_MODEL_MEMORY"] = fmt.Sprintf("%d", memory)
 	envsWm["CDS_API"] = udataParam.API
 	envsWm["CDS_TOKEN"] = udataParam.Token