ARMADA-2970 Small simulator improvements (#274) (#4052)

* ARMADA-2970 Small simulator improvements

 - Log input files consistently
 - Fix log output to only occur every 5 seconds
   - Was bugged to log every round, but only after 5 seconds
 - Remove variance on gang jobs, so the finish at the same time

* Set 0 tailmean

Co-authored-by: James Murkin <James.Murkin@gresearch.co.uk>

cmd/simulator/cmd/root.go

@@ -123,8 +123,8 @@ func runSimulations(cmd *cobra.Command, args []string) error {
 	defer outputSink.Close(ctx)
 
 	ctx.Info("Armada simulator")
-	ctx.Infof("ClusterSpec: %v", clusterSpec.Name)
-	ctx.Infof("WorkloadSpecs: %v", workloadSpec.Name)
+	ctx.Infof("ClusterSpec: %v", clusterFile)
+	ctx.Infof("WorkloadSpecs: %v", workloadFile)
 	ctx.Infof("SchedulingConfig: %v", configFile)
 	ctx.Infof("OutputDir: %v", outputDirPath)
 

internal/scheduler/simulator/simulator.go

@@ -235,7 +235,7 @@ func (s *Simulator) Run(ctx *armadacontext.Context) error {
 		}
 		if time.Now().Unix()-lastLogTime.Unix() >= 5 {
 			ctx.Infof("Simulator time %s", s.time)
-			lastLogTime = s.time
+			lastLogTime = time.Now()
 		}
 		if s.time.After(simTerminationTime) {
 			ctx.Infof("Current simulated time (%s) exceeds runtime deadline (%s). Terminating", s.time, simTerminationTime)
@@ -465,6 +465,8 @@ func submitJobFromJobTemplate(jobId string, jobTemplate *JobTemplate, gangId str
 		} else {
 			annotations[serverconfig.GangNodeUniformityLabelAnnotation] = "armadaproject.io/clusterName"
 		}
+		// Make it so gang jobs end at the same time, this means they don't have a distribution currently
+		jobTemplate.RuntimeDistribution.TailMean = 0
 	}
 
 	return &armadaevents.SubmitJob{