Skip to content
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: Add OCIO configuration to Job Environments #166

Merged
merged 3 commits into from
Sep 19, 2024

Conversation

diane-hj
Copy link
Contributor

@diane-hj diane-hj commented Sep 17, 2024

What was the problem/requirement? (What/Why)

  • There are 3 ways to set OCIO configuration in Nuke: environment variable, custom config, and default config that is defined in Nuke already. The original implementation only took care of custom config. We want to handle when customer set their OCIO configuration in environment variable or default config.

What was the solution? (How)

  • When OCIO is enabled, check the configuration path for all three options, then set the path via JobEnvironment in JobTemplate.

What is the impact of this change?

  • When environment variable is set, the path will be set with environment variable
  • When custom config is set, the path will be set with custom config
  • When default config is set, the path will be set with default config

How was this change tested?

  • Submitted the job with OCIO setup, and verified it rendered successfully
  • Submitted the above job with different OCIO setup, verified it rendered successfully, and verified the output looks different in color scheme
  • Submitted the job with OCIO environment variable, and verified it rendered successfully

Did you run the "Job Bundle Output Tests"? If not, why not? If so, paste the test results here.


Timestamp: 2024-09-16T22:51:08.146094-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/group-read

group-read
Test succeeded

Timestamp: 2024-09-16T22:51:08.578900-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/noise-saver

noise-saver
Test succeeded

Timestamp: 2024-09-16T22:51:08.968215-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/multi-load-save

multi-load-save
Test succeeded

Timestamp: 2024-09-16T22:51:09.358968-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/frame

frame
Test succeeded

Timestamp: 2024-09-16T22:51:09.757446-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/ocio

ocio
Test succeeded

Timestamp: 2024-09-16T22:51:10.157282-07:00
Running job bundle output test: /Users/chaejung/Desktop/submitter/deadline-cloud-for-nuke/job_bundle_output_tests/cwd-path

cwd-path
Test succeeded

All tests passed, ran 6 total.
Timestamp: 2024-09-16T22:51:13.578587-07:00

Was this change documented?

No

Is this a breaking change?

No - In Nuke, environment variable takes precedence over other ocio configurations. (Ex. When OCIO environment variable is set, updating custom config in UI is disabled with the message: OCIO environment variable is set. Setting OCIO configs from within Nuke will be disabled.)

The existing user who uses custom config will continue to work.


By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@diane-hj diane-hj requested a review from a team as a code owner September 17, 2024 06:08
src/deadline/nuke_submitter/assets.py Outdated Show resolved Hide resolved
src/deadline/nuke_submitter/assets.py Outdated Show resolved Hide resolved
src/deadline/nuke_submitter/deadline_submitter_for_nuke.py Outdated Show resolved Hide resolved
src/deadline/nuke_submitter/assets.py Outdated Show resolved Hide resolved
src/deadline/nuke_submitter/deadline_submitter_for_nuke.py Outdated Show resolved Hide resolved
src/deadline/nuke_util/ocio.py Outdated Show resolved Hide resolved
crowecawcaw
crowecawcaw previously approved these changes Sep 18, 2024
Haejung Choi added 3 commits September 18, 2024 20:14
Signed-off-by: Haejung Choi <chaejung@amazon.com>
Signed-off-by: Haejung Choi <chaejung@amazon.com>
…d job bundle output

Signed-off-by: Haejung Choi <chaejung@amazon.com>
Copy link

sonarcloud bot commented Sep 19, 2024

@diane-hj diane-hj merged commit 0eb87cb into aws-deadline:mainline Sep 19, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants