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

feat: Handle different OCIO configs in adapter #168

Conversation

StevenBanaszak
Copy link
Contributor

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

We need to support multiple ways of specifying an OCIO config. The adapter was failing on anything but custom configs.

What was the solution? (How)

Change the assumptions that get_custom_config_path was the best way to get the OCIO config.

What is the impact of this change?

The adapter supports multiple ways of specifying an OCIO config.

How was this change tested?

  1. Run the adapter with a default config NUKE_ADAPTOR_NUKE_EXECUTABLE=/Applications/Nuke15.0v4/Nuke15.0v4.app/Contents/MacOS/Nuke15.0 nuke-openjd run --init-data file:///Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/init-data.yaml --run-data file:///Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/run-data.yaml
  2. Run the previous command but with a stock config (in this case I used aces_1.2)
  3. Run the adapter with an env variable config OCIO=/Applications/Nuke15.0v4/Nuke15.0v4.app/Contents/Resources/OCIOConfigs/configs/aces_1.2/config.ocio NUKE_ADAPTOR_NUKE_EXECUTABLE=/Applications/Nuke15.0v4/Nuke15.0v4.app/Contents/MacOS/Nuke15.0 nuke-openjd run --init-data file:///Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/init-data.yaml --run-data file:///Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/run-data.yaml
  4. Run the submitter with the default config. Verify that the job succeeds.
  5. Run the submitter with a stock config. Verify that the job succeeds.
  6. Run the submitter with the env config. Verify that the job succeeds.

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


Timestamp: 2024-10-06T15:25:40.036025-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/group-read

group-read
Test succeeded

Timestamp: 2024-10-06T15:25:40.836416-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/noise-saver

noise-saver
Test succeeded

Timestamp: 2024-10-06T15:25:41.552605-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/multi-load-save

multi-load-save
Test succeeded

Timestamp: 2024-10-06T15:25:42.259920-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/frame

frame
Test succeeded

Timestamp: 2024-10-06T15:25:42.902532-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/ocio

ocio
Test succeeded

Timestamp: 2024-10-06T15:25:43.596009-07:00
Running job bundle output test: /Users/sbanas/dev/deadline-clients/deadline-cloud-for-nuke/job_bundle_output_tests/cwd-path

cwd-path
Test succeeded

All tests passed, ran 6 total.
Timestamp: 2024-10-06T15:25:52.870799-07:00

Was this change documented?

No. Is there a place that needs to be updated?

Is this a breaking change?

No

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

@StevenBanaszak StevenBanaszak requested a review from a team as a code owner October 6, 2024 22:27
Copy link

@eherozhao eherozhao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in order to pass DCO check, you can run

git rebase HEAD~1 --signoff

@StevenBanaszak StevenBanaszak force-pushed the update-ocio-config-in-adapter branch from 7c83d33 to 6c8ec85 Compare October 7, 2024 17:07
Copy link

sonarqubecloud bot commented Oct 7, 2024

@StevenBanaszak StevenBanaszak merged commit 5d55675 into aws-deadline:mainline Oct 7, 2024
12 checks passed
@StevenBanaszak StevenBanaszak deleted the update-ocio-config-in-adapter branch October 7, 2024 18:58
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.

3 participants