-
Notifications
You must be signed in to change notification settings - Fork 42
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(integ): Support last changes in Deadline 10.1.11 #248
Conversation
@@ -111,6 +111,7 @@ export abstract class RenderQueueConnection { | |||
'if [ -f "/etc/profile.d/deadlineclient.sh" ]; then', | |||
' source "/etc/profile.d/deadlineclient.sh"', | |||
'fi', | |||
'"\${DEADLINE_PATH}/deadlinecommand" -SetIniFileSetting LaunchSlaveAtStartup True', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do not want to set this here. This class is a generic class used to set up any deadline isntance being able to connect to a render queue not specifically workers as such your changes make it so any Workstation, Pulse or other component automatically starts up workers.
This setting is also already being set in the ConfigureWorker.sh which is where I would expect all of this code to exist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
After offline discussion we have found a way not to start worker before configuration Pools and Groups.
@@ -122,6 +123,7 @@ export abstract class RenderQueueConnection { | |||
host.userData.addCommands( | |||
'$ErrorActionPreference = "Stop"', | |||
'$DEADLINE_PATH = (get-item env:"DEADLINE_PATH").Value', | |||
'& "$DEADLINE_PATH/deadlinecommand.exe" -SetIniFileSetting LaunchSlaveAtStartup True | Out-Default', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as Above this class should have no Worker specific code in it.
integ/components/deadline/deadline_03_workerFleetHttp/test/deadline_03_workerFleetHttp.test.ts
Outdated
Show resolved
Hide resolved
abe3e49
to
0ecde17
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Thanks Eugene!
integ/components/deadline/deadline_03_workerFleetHttp/test/deadline_03_workerFleetHttp.test.ts
Outdated
Show resolved
Hide resolved
0ecde17
to
415064c
Compare
Problem
The last Deadline 10.1.11 brings some changes that make RFDK integration tests fail.
DeadlineLauncher
right after start leads to worker continue without last changes indeadline.ini
Solution
unrecognized
region instead oftestregion
Testing
For testing were ran integration tests and make sure that all tests passed.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license