Skip to content

Commit 61a4de0

Browse files
committed
Update to the package command to handle containers and zip archives. Removed an errant entry from the lauch list.
1 parent 1ca9afd commit 61a4de0

2 files changed

Lines changed: 277 additions & 7 deletions

File tree

repo.toml

Lines changed: 276 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,22 @@ log_message = "The ./repo${shell_ext} package --container argument has been depr
2626
tool_name = "repo_package"
2727
command = "package"
2828
arg_name = "--target-app"
29+
linked_arg = "--container"
2930
arg_redirect_name = "--app"
3031

3132
[[repo.deprecations]]
3233
tool_name = "repo_package"
3334
command = "package"
3435
arg_name = "--name"
36+
linked_arg = "--container"
3537
arg_redirect_name = "--image-tag"
3638
log_message = "The redirected argument --name to --image-tag has new behavior. If a value of image_name:version_string is provided, that will be used to build your container. If no colon is detected, your container's tag will be application_name:the_value_of_this_argument"
3739

3840
[[repo.deprecations]]
3941
tool_name = "repo_package"
4042
command = "package"
4143
arg_name = "-n"
44+
linked_arg = "--container"
4245
arg_redirect_name = "--image-tag"
4346
log_message = "The redirected argument -n to --image-tag has new behavior. If a value of image_name:version_string is provided, that will be used to build your container. If no colon is detected, your container's tag will be application_name:the_value_of_this_argument"
4447

@@ -62,17 +65,32 @@ fetch."token:cache==true".after_pull_commands = []
6265
[repo_build.build]
6366
enabled = true
6467
"platform:windows-x86_64".enabled = false
68+
# AUTOREMOVE: BEGIN
69+
# Enable all compilation in CI
70+
"token:in_ci==true".enabled = true
71+
# AUTOREMOVE: END
6572

6673
[repo_build.msbuild]
6774
# If set to true will attempt to link to host's Visual Studio and Windows SDK installations.
6875
# This is needed if C++ compilation is needed on Windows, and repo_build.build.enabled is set to true.
6976
link_host_toolchain = false
77+
# AUTOREMOVE: BEGIN
78+
# Internally enable host linking in CI
79+
"token:in_ci==true".link_host_toolchain = true
80+
# AUTOREMOVE: END
7081

7182
# Filter on Visual Studio version e.g.: Visual Studio 2022. Empty string will match all years and prioritize the newest.
7283
vs_version = "vs2022"
84+
# AUTOREMOVE: BEGIN
85+
"token:in_ci==true".vs_version = "vs2019"
86+
# AUTOREMOVE: END
7387

7488
# Visual Studio path; This will be used if the user would like to point to a specific VS installation rather than rely on heuristic locating.
7589
# vs_path = "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\"
90+
# AUTOREMOVE: BEGIN
91+
# Internal CI Visual Studio path that sometimes works.
92+
"token:in_ci==true".vs_path = "C:\\vs2019"
93+
# AUTOREMOVE: END
7694

7795
# Filter specifically to "Enterprise", "Professional", or "Community" editions of Visual Studio
7896
# vs_edition = "Community"
@@ -112,16 +130,21 @@ publish_pip_cache = false
112130
[repo_precache_exts]
113131
# Apps to run and precache
114132
apps = [
133+
# AUTOREMOVE: BEGIN
134+
"${root}/templates/omni.all.template.extensions.kit",
135+
# AUTOREMOVE: END
115136
]
116137

117-
registries = [
118-
{ name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/${kit_version_major}/shared" },
119-
{ name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" },
120-
{ name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" },
121-
]
138+
# registries = [
139+
# PUBLIC REGISTRIES - UNCOMMENT BEFORE STAGING TO GITHUB
140+
# { name = "kit/default", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/${kit_version_major}/shared" },
141+
# { name = "kit/sdk", url = "https://ovextensionsprod.blob.core.windows.net/exts/kit/prod/sdk/${kit_version_short}/${kit_git_hash}" },
142+
# { name = "kit/community", url = "https://dw290v42wisod.cloudfront.net/exts/kit/community" },
143+
# ]
122144

123145
# Generated kit file with all extensions in the repo
124-
generated_app_path = "${root}/source/apps/exts.deps.generated.kit"
146+
generated_app_path = "${root}/_build/apps/exts.deps.generated.kit"
147+
125148

126149
########################################################################################################################
127150
# Packaging
@@ -248,6 +271,253 @@ type_ordering = [
248271
]
249272

250273

274+
# AUTOREMOVE: BEGIN
275+
#----------------------------------------------------------------------------------------------------------------------#
276+
#----------------------------------------------------------------------------------------------------------------------#
277+
#----------------------------------------------------------------------------------------------------------------------#
278+
279+
# Uncomment to start MRs to prod branch of public-extension-pipeline
280+
[repo_deploy_exts.pipeline_repo.branch."prod-109"]
281+
skip_if_build_is_mr = true
282+
fail_if_exts_are_missing = false
283+
create_mr = true
284+
auto_merge_mr = false
285+
286+
287+
[repo_deploy_exts.pipeline_repo.branch."integ-109"]
288+
skip_if_build_is_mr = true
289+
fail_if_exts_are_missing = false
290+
create_mr = true
291+
auto_merge_mr = true
292+
293+
########################################################################################################################
294+
# Test Runner
295+
########################################################################################################################
296+
[repo_test]
297+
# NOTE: To find more info on repo_test settings look into: '_repo/deps/repo_test/repo_tools.toml'
298+
default_suite = "alltests"
299+
300+
# When running from package, look for package using that path/pattern:
301+
# This is a very loose setup expecting a single packaged app archive.
302+
archive_pattern = "${root}/_build/packages/*.zip"
303+
304+
305+
[repo_test.suites."alltests"]
306+
exclude = [
307+
# exclude setup extension, those tests are part of app testing
308+
"tests-omni.usd_explorer.setup${shell_ext}",
309+
]
310+
311+
[repo_test.suites."check_app_version_locks"]
312+
kind = "pytest"
313+
314+
# Where our tests live
315+
discover_path = "${root}/tools/ci/tests"
316+
# Where our source lives
317+
python_source_path = "tools/ci/*"
318+
319+
log_file = "_build/test/results.xml"
320+
321+
# to prevent pytest capturing stdout add "-s"
322+
extra_pytest_args = [
323+
"-s",
324+
]
325+
326+
327+
########################################################################################################################
328+
# Extensions publisher
329+
########################################################################################################################
330+
331+
[repo_publish_exts]
332+
333+
# Publish the fake app for ETM's usage.
334+
335+
# Supported configs and platforms when `-a` cmd is used
336+
configs = ["release"] # removed debug
337+
338+
# Extensions to publish, include and exclude among those discovered by kit. Wildcards are supported.
339+
exts.include = [
340+
"omni.etm.list.kit_app_template",
341+
]
342+
exts.exclude = []
343+
344+
# verify before publishing
345+
publish_verification = false
346+
347+
# The default behavior is to publish the file to S3. Use the default behavior to avoid potential issues in the future.
348+
# If you want to publish the file locally, uncomment the following line and run the CI job locally. Then the file will
349+
# be saved in the registry instead of S3.
350+
# use_packman_to_upload_archive = false
351+
352+
# Explicitly set the internal registry.
353+
# Comment out the old default registry to use the correct default registry from Kit SDK.
354+
# registries = [
355+
# { name = "kit/default", url = "omniverse://kit-extensions.ov.nvidia.com/exts/kit/default" },
356+
# ]
357+
358+
########################################################################################################################
359+
# Tool to promote extensions to the public registry pipeline
360+
########################################################################################################################
361+
362+
[repo_deploy_exts]
363+
enabled = true
364+
365+
# Generate the public extension registry MR for versions like 1.2.3-rc.1, 1.2.3-prod.1, 1.2.3, but not for 1.2.3-beta.1 etc
366+
run_if_app_version_regex = "(.*-(rc|prod|stage).*)|((?!.*-).*)"
367+
368+
369+
########################################################################################################################
370+
# Launcher publish and deploy
371+
########################################################################################################################
372+
373+
# Customized fields of apps are updated in deploy_launcher.py
374+
[repo_deploy_launcher]
375+
enabled = true
376+
git_url = "https://oauth2:${env:GITLAB_AUTH_TOKEN}@gitlab-master.nvidia.com/omniverse/release-pipelines/usd_explorer-release-pipeline.git"
377+
378+
# NOTE: Overriding arrays is not supported. The CI job script will remove directories of the other apps.
379+
# http://omniverse-docs.s3-website-us-east-1.amazonaws.com/repo_man/1.62.0/docs/configuration.html#command-line-config-overrides
380+
template_paths = [
381+
"${root}/launcher-configs/usd_explorer/launcher-pipeline-template",
382+
"${root}/launcher-configs/usd_viewer/launcher-pipeline-template",
383+
"${root}/launcher-configs/usd_composer/launcher-pipeline-template",
384+
]
385+
386+
[repo_deploy_launcher.slack]
387+
enabled = false # Explicitly disable it. It doesn't work because the CI env var SLACK_CHANGELOG_PUBLISH_URL is not set.
388+
# If it's needed, use a different way to set it based on apps.
389+
slack_url = "${env:SLACK_CHANGELOG_PUBLISH_URL}" #omni-apollo-app / #omni-usd-composer / #omni-runway-release
390+
write_jira = true
391+
inline_changelog = false
392+
393+
repo_url = "https://gitlab-master.nvidia.com/omniverse/kit-apps/factory-explorer/"
394+
395+
jira_service_account_name = "${env:JIRA_AUTOMATION_SERVICE_ACCOUNT_NAME}"
396+
jira_service_account_api_key = "${env:JIRA_AUTOMATION_SERVICE_ACCOUNT_API_KEY}"
397+
jira_server_url = "https://jirasw.nvidia.com"
398+
399+
400+
########################################################################################################################
401+
# Documentation building
402+
########################################################################################################################
403+
404+
[repo_docs]
405+
project = "kit-app-template"
406+
use_fast_doxygen_conversion = false
407+
408+
sphinx_exclude_patterns = [
409+
"templates",
410+
"readme-assets",
411+
"_repo",
412+
"_build",
413+
"tools",
414+
"source",
415+
"tutorial_code",
416+
"SECURITY.md",
417+
"launcher-configs",
418+
"README_internal.md",
419+
"CHANGELOG.md",
420+
".gitlab"
421+
]
422+
423+
sphinx_include_patterns = ["docs"]
424+
425+
[repo_ci]
426+
427+
[repo_ci.jobs."build"]
428+
script = "${root}/tools/ci/build.py"
429+
430+
[repo_ci.jobs."check_app_version_locks"]
431+
script = "${root}/tools/ci/check_app_version_locks.py"
432+
433+
[repo_ci.jobs."check_extension_support_levels"]
434+
script = "${root}/tools/ci/check_extension_support_levels.py"
435+
436+
[repo_ci.jobs."publish_etm_list"]
437+
script = "${root}/tools/ci/publish_etm_list.py"
438+
439+
[repo_ci.jobs."check_production_registry"]
440+
script = "${root}/tools/ci/check_production_registry.py"
441+
442+
[repo_ci.jobs."package_nspect_artifact"]
443+
script = "${root}/tools/ci/package_nspect_artifact.py"
444+
445+
[repo_ci.jobs."container_builder"]
446+
script = "${root}/tools/ci/container_builder.py"
447+
448+
[repo_ci.jobs."container_publisher"]
449+
script = "${root}/tools/ci/container_publisher.py"
450+
451+
452+
########################################################################################################################
453+
# Tool to strip down parts of repo and git push to github
454+
########################################################################################################################
455+
456+
[repo_stage_for_github]
457+
enabled = true
458+
459+
github_repo_url = "https://github.com/NVIDIA-Omniverse/kit-app-template-staging.git"
460+
461+
exclude = [
462+
".git",
463+
".gitlab-ci.yml",
464+
"tools/ci/*",
465+
"launcher-configs",
466+
"docs",
467+
"tools/deps/repo-deps-nv.packman.xml",
468+
"index.rst",
469+
"tutorial_code",
470+
"templates/omni.all.template.extensions.kit",
471+
"README_internal.md",
472+
]
473+
474+
[[repo_stage_for_github.trim]]
475+
files = [
476+
"repo.toml",
477+
"templates/apps/kit_base_editor/kit_base_editor.kit",
478+
"templates/apps/kit_service/kit_service.kit",
479+
"templates/apps/usd_composer/omni.usd_composer.kit",
480+
"templates/apps/usd_explorer/omni.usd_explorer.kit",
481+
"templates/apps/usd_viewer/omni.usd_viewer.kit",
482+
"templates/apps/streaming_configs/default_stream.kit",
483+
"templates/apps/streaming_configs/gdn_stream.kit",
484+
"templates/apps/streaming_configs/nvcf_stream.kit",
485+
]
486+
begin_marker = "# AUTOREMOVE: BEGIN"
487+
end_marker = "# AUTOREMOVE: END"
488+
489+
[[repo_stage_for_github.trim]]
490+
# Sanitize the Packman config file.
491+
files = [
492+
"tools/packman/config.packman.xml"
493+
]
494+
begin_marker = "<!-- AUTOREMOVE: BEGIN -->"
495+
end_marker = "<!-- AUTOREMOVE: END -->"
496+
497+
498+
#####################
499+
# Formatter
500+
#####################
501+
[repo_format.cpp]
502+
maintain_legal_blurbs = false
503+
504+
[repo_format.python]
505+
maintain_legal_blurbs = false
506+
files.exclude = [
507+
"_build/*",
508+
"_repo/*",
509+
".git/*",
510+
".eggs/*",
511+
".venv/*",
512+
"tools/packman/*",
513+
"templates/*",
514+
"source/*",
515+
]
516+
517+
#----------------------------------------------------------------------------------------------------------------------#
518+
#----------------------------------------------------------------------------------------------------------------------#
519+
#----------------------------------------------------------------------------------------------------------------------#
520+
# AUTOREMOVE: END
251521

252522
########################################################################################################################
253523
# Application Launching

tools/deps/repo-deps.packman.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<project toolsVersion="5.0">
22
<dependency name="repo_man" linkPath="../../_repo/deps/repo_man">
3-
<package name="repo_man" version="1.92.0"/>
3+
<package name="repo_man" version="1.92.5"/>
44
</dependency>
55
<dependency name="repo_build" linkPath="../../_repo/deps/repo_build">
66
<package name="repo_build" version="1.17.1"/>

0 commit comments

Comments
 (0)