Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 3432eab5 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'deterministic_output_path_traci' into 'master'

override timestap if using remoteScenarioRun

See merge request !130
parents e012fe0f 6c0e4bbc
Pipeline #261266 passed with stages
in 134 minutes and 8 seconds
......@@ -21,7 +21,8 @@ public class RemoteScenarioRun extends ScenarioRun implements RemoteRunListener
public RemoteScenarioRun(Scenario scenario, Path outputDir, RunnableFinishedListener scenarioFinishedListener, Path scenarioPath, ScenarioCache scenarioCache) {
super(scenario, outputDir.toString(), scenarioFinishedListener, scenarioPath, scenarioCache);
// overwriteTimestampSetting. In RemoteScenarioRun the caller defines where the output should go.
super(scenario, outputDir.toString(), true,scenarioFinishedListener, scenarioPath, scenarioCache);
this.singleStepMode = true;
this.waitForLoopEnd = new Object();
this.lock = new ReentrantLock();
......
......@@ -73,19 +73,10 @@ public class SimulationCfg {
}
public String outputPath() {
if (outputVecFile.endsWith(".vec")) {
return outputVecFile.substring(0, outputVecFile.length() - 4);
}
if (outputScalarFile.endsWith(".sca")) {
return outputScalarFile.substring(0, outputScalarFile.length() - 4);
}
return String.format("%s/%s/%s/%s_vars_%s_rep_%s",
return String.format("%s/%s_%s/vadere.d",
resultRootDir,
configName,
experiment,
dateTime,
iterationVariables,
repetition
experiment
);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment