Skip to content

Commit

Permalink
Remove instance name from job file paths
Browse files Browse the repository at this point in the history
  • Loading branch information
APErebus committed Nov 30, 2023
1 parent 5e10c1f commit dce6add
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ async Task CreateJob(IScriptLogWriter writer, CancellationToken cancellationToke
Command = new List<string> { "bash" },
Args = new List<string>
{
$"/data/tentacle-home/{instanceName}/Work/{scriptTicket.TaskId}/bootstrapRunner.sh",
$"/data/tentacle-home/{instanceName}/Work/{scriptTicket.TaskId}",
$"/data/tentacle-home/{instanceName}/Work/{scriptTicket.TaskId}/{scriptName}"
$"/data/tentacle-home/Work/{scriptTicket.TaskId}/bootstrapRunner.sh",
$"/data/tentacle-home/Work/{scriptTicket.TaskId}",
$"/data/tentacle-home/Work/{scriptTicket.TaskId}/{scriptName}"
}.Concat((workspace.ScriptArguments ?? Array.Empty<string>())
.SelectMany(arg => new[]
{
Expand All @@ -229,8 +229,8 @@ async Task CreateJob(IScriptLogWriter writer, CancellationToken cancellationToke
},
Env = new List<V1EnvVar>
{
new(EnvironmentVariables.TentacleHome, $"/data/tentacle-home/{instanceName}"),
new(EnvironmentVariables.TentacleJournal, $"/data/tentacle-home/{instanceName}/DeploymentJournal.xml"),
new(EnvironmentVariables.TentacleHome, $"/data/tentacle-home"),
new(EnvironmentVariables.TentacleJournal, $"/data/tentacle-home/DeploymentJournal.xml"),
new(EnvironmentVariables.TentacleInstanceName, instanceName),
new(EnvironmentVariables.TentacleVersion, Environment.GetEnvironmentVariable(EnvironmentVariables.TentacleVersion)),
new(EnvironmentVariables.TentacleCertificateSignatureAlgorithm, Environment.GetEnvironmentVariable(EnvironmentVariables.TentacleCertificateSignatureAlgorithm)),
Expand Down

0 comments on commit dce6add

Please sign in to comment.