Skip to content

Commit 827d79d

Browse files
authored
Merge pull request #311 from mssonicbld/sonicbld/202603-merge
```<br>* 7e3dc2b - (HEAD -> 202603) Merge branch '202511' of https://github.com/sonic-net/sonic-utilities into 202603 (2026-04-17) [Sonic Automation] * 0adc01f - (origin/202511) Add stop-time option to App Extension, to stop container after wanted number of seconds (#4464) (2026-04-16) [mssonicbld]<br>```
2 parents 53b792b + 7e3dc2b commit 827d79d

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

sonic_package_manager/manifest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def unmarshal(self, value):
204204
ManifestField('delayed', DefaultMarshaller(bool), False),
205205
ManifestField('check_up_status', DefaultMarshaller(bool), False),
206206
ManifestField('type', DefaultMarshaller(str), ''),
207+
ManifestField('stop-time', DefaultMarshaller(str), ''),
207208
ManifestRoot('warm-shutdown', [
208209
ManifestArray('after', DefaultMarshaller(str)),
209210
ManifestArray('before', DefaultMarshaller(str)),

sonic_package_manager/service_creator/creator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ def generate_container_mgmt(self, package: Package):
252252

253253
image_id = package.image_id
254254
name = package.manifest['service']['name']
255+
stop_time = package.manifest['service']['stop-time']
255256
container_spec = package.manifest['container']
256257
script_path = os.path.join(DOCKER_CTL_SCRIPT_LOCATION, f'{name}.sh')
257258
script_template = get_tmpl_path(DOCKER_CTL_SCRIPT_TEMPLATE)
@@ -285,7 +286,8 @@ def generate_container_mgmt(self, package: Package):
285286
'docker_image_name': package.entry.repository,
286287
'docker_image_reference': package.entry.docker_image_reference,
287288
'docker_image_run_opt': run_opt,
288-
'sonic_asic_platform': sonic_asic_platform
289+
'sonic_asic_platform': sonic_asic_platform,
290+
'stop_time': stop_time
289291
}
290292
render_template(script_template, script_path, render_ctx, executable=True)
291293
log.info(f'generated {script_path}')

0 commit comments

Comments
 (0)