diff --git a/tests/container_upgrade/container_upgrade_helper.py b/tests/container_upgrade/container_upgrade_helper.py index dcfea0081dd..cfa4668ff94 100644 --- a/tests/container_upgrade/container_upgrade_helper.py +++ b/tests/container_upgrade/container_upgrade_helper.py @@ -93,7 +93,7 @@ def create_testcase_mapping(testcase_file): def create_parameters_mapping(containers, parameters_file): with open(parameters_file, 'r') as file: data = json.load(file) - container_parameters = {container: details['parameters'] for container, details in data.items()} + container_parameters = {container: ' '.join(details['parameters']) for container, details in data.items()} return container_parameters diff --git a/tests/container_upgrade/parameters.json b/tests/container_upgrade/parameters.json index f29ce3a615d..d44014264a0 100644 --- a/tests/container_upgrade/parameters.json +++ b/tests/container_upgrade/parameters.json @@ -1,26 +1,90 @@ { "docker-sonic-telemetry": { - "parameters": "" + "parameters": [] }, "docker-sonic-gnmi": { - "parameters": "--net=host --pid=host --userns=host --uts=host --cap-add=SYS_ADMIN --cap-add=SYS_BOOT --cap-add=SYS_PTRACE --cap-add=NET_ADMIN --cap-add=DAC_OVERRIDE --security-opt apparmor=unconfined --security-opt seccomp=unconfined -v /etc/sonic:/etc/sonic:ro -v /etc/localtime:/etc/localtime:ro -v /etc/fips/fips_enable:/etc/fips/fips_enable:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -v /var/run/dbus:/var/run/dbus:rw -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-chassis:/var/run/redis-chassis:ro --env RUNTIME_OWNER=local" + "parameters": [ + "--net=host", + "--pid=host", + "--userns=host", + "--uts=host", + "--cap-add=SYS_ADMIN", + "--cap-add=SYS_BOOT", + "--cap-add=SYS_PTRACE", + "--cap-add=NET_ADMIN", + "--cap-add=DAC_OVERRIDE", + "--security-opt apparmor=unconfined", + "--security-opt seccomp=unconfined", + "-v /etc/sonic:/etc/sonic:ro", + "-v /etc/localtime:/etc/localtime:ro", + "-v /etc/fips/fips_enable:/etc/fips/fips_enable:ro", + "-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro", + "-v /var/run/dbus:/var/run/dbus:rw", + "-v /var/run/redis:/var/run/redis:rw", + "-v /var/run/redis-chassis:/var/run/redis-chassis:ro", + "--env RUNTIME_OWNER=local" + ] }, "docker-gnmi-watchdog": { - "parameters": "--pid=host --net=host -v /etc/localtime:/etc/localtime:ro -v /etc/sonic:/etc/sonic:ro" + "parameters": [ + "--pid=host", + "--net=host", + "-v /etc/localtime:/etc/localtime:ro", + "-v /etc/sonic:/etc/sonic:ro" + ] }, "docker-sonic-bmp": { - "parameters": "--net=host -v /etc/sonic:/etc/sonic:ro -v /etc/localtime:/etc/localtime:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-bmp:/var/run/redis-bmp:ro" + "parameters": [ + "--net=host", + "-v /etc/sonic:/etc/sonic:ro", + "-v /etc/localtime:/etc/localtime:ro", + "-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro", + "-v /var/run/redis:/var/run/redis:rw", + "-v /var/run/redis-bmp:/var/run/redis-bmp:ro" + ] }, "docker-bmp-watchdog": { - "parameters": "--pid=host --net=host -v /etc/localtime:/etc/localtime:ro -v /etc/sonic:/etc/sonic:ro" + "parameters": [ + "--pid=host", + "--net=host", + "-v /etc/localtime:/etc/localtime:ro", + "-v /etc/sonic:/etc/sonic:ro" + ] }, "docker-sonic-restapi": { - "parameters": "--net=host -v /var/run/redis/redis.sock:/var/run/redis/redis.sock -v /etc/sonic/credentials:/etc/sonic/credentials:ro -v /etc/localtime:/etc/localtime:ro -v /var/run/redis:/var/run/redis:rw -v /var/run/redis-chassis:/var/run/redis-chassis:ro -v /etc/fips/fips_enable:/etc/fips/fips_enable:ro -v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro -e RUNTIME_OWNER=local -e NAMESPACE_PREFIX=asic -e CONTAINER_NAME=restapi -e SYSLOG_TARGET_IP=127.0.0.1" + "parameters": [ + "--net=host", + "-v /var/run/redis/redis.sock:/var/run/redis/redis.sock", + "-v /etc/sonic/credentials:/etc/sonic/credentials:ro", + "-v /etc/localtime:/etc/localtime:ro", + "-v /var/run/redis:/var/run/redis:rw", + "-v /var/run/redis-chassis:/var/run/redis-chassis:ro", + "-v /etc/fips/fips_enable:/etc/fips/fips_enable:ro", + "-v /usr/share/sonic/templates/rsyslog-container.conf.j2:/usr/share/sonic/templates/rsyslog-container.conf.j2:ro", + "-e RUNTIME_OWNER=local", + "-e NAMESPACE_PREFIX=asic", + "-e CONTAINER_NAME=restapi", + "-e SYSLOG_TARGET_IP=127.0.0.1" + ] }, "docker-restapi-watchdog": { - "parameters": "--net=host -v /etc/localtime:/etc/localtime:ro" + "parameters": [ + "--net=host", + "-v /etc/localtime:/etc/localtime:ro" + ] }, "docker-restapi-sidecar": { - "parameters": "--privileged --pid=host --net=host --uts=host --ipc=host -v /etc/sonic:/etc/sonic:ro -v /usr/bin/docker:/usr/bin/docker:ro -v /var/run/docker.sock:/var/run/docker.sock -v /:/hostroot:ro -e DOCKER_BIN=/usr/bin/docker" + "parameters": [ + "--privileged", + "--pid=host", + "--net=host", + "--uts=host", + "--ipc=host", + "-v /etc/sonic:/etc/sonic:ro", + "-v /usr/bin/docker:/usr/bin/docker:ro", + "-v /var/run/docker.sock:/var/run/docker.sock", + "-v /:/hostroot:ro", + "-e DOCKER_BIN=/usr/bin/docker" + ] } }