diff --git a/ansible/roles/vm_set/tasks/add_ceos_list.yml b/ansible/roles/vm_set/tasks/add_ceos_list.yml index 92d1656d23..02b998e5ee 100644 --- a/ansible/roles/vm_set/tasks/add_ceos_list.yml +++ b/ansible/roles/vm_set/tasks/add_ceos_list.yml @@ -181,7 +181,7 @@ become: yes docker_container: name: net_{{ vm_set_name }}_{{ vm_name }} - image: "{{ docker_registry_host }}/debian:jessie" + image: "{{ debian_docker_registry_host }}/debian:trixie" pull: no state: started restart: no diff --git a/ansible/vars/docker_registry.yml b/ansible/vars/docker_registry.yml index 238cf56685..d4e1c99293 100644 --- a/ansible/vars/docker_registry.yml +++ b/ansible/vars/docker_registry.yml @@ -1 +1,2 @@ docker_registry_host: sonicdev-microsoft.azurecr.io:443 +debian_docker_registry_host: publicmirror.azurecr.io:443 diff --git a/setup-container.sh b/setup-container.sh index d05f1d6157..6f18670bee 100755 --- a/setup-container.sh +++ b/setup-container.sh @@ -39,7 +39,7 @@ declare EXISTING_CONTAINER_NAME="" ENV_VARS="" CONTAINER_NAME="" -IMAGE_ID="" +IMAGE_ID="sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:master" LINK_DIR="" MOUNT_POINTS="-v \"/var/run/docker.sock:/var/run/docker.sock:rslave\"" PUBLISH_PORTS="" @@ -104,9 +104,7 @@ function show_help_and_exit() { echo "Other options:" echo " -e set environment variable inside the container (can be used multiple times)" echo " -i specify Docker image to use. This can be an image ID (hashed value) or an image name." - echo " If no value is provided, defaults to the following images in the specified order:" - echo " 1. The local image named \"docker-sonic-mgmt\"" - echo " 2. The remote image at \"sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:latest\"" + echo " (default: \"sonicdev-microsoft.azurecr.io:443/docker-sonic-mgmt:master\")" echo " -d specify directory inside container to bind mount to sonic-mgmt root (default: \"/var/src\")" echo " -m specify directory to bind mount to container" echo " -p publish container port to the host" diff --git a/tests/common/connections/base_console_conn.py b/tests/common/connections/base_console_conn.py index c82297262c..1b14e99d01 100644 --- a/tests/common/connections/base_console_conn.py +++ b/tests/common/connections/base_console_conn.py @@ -5,7 +5,10 @@ import logging from netmiko.cisco_base_connection import CiscoBaseConnection -from netmiko.ssh_exception import NetMikoAuthenticationException +try: + from netmiko.ssh_exception import NetMikoAuthenticationException +except ImportError: + from netmiko.exceptions import NetMikoAuthenticationException # For interactive shell import sys diff --git a/tests/common/connections/ssh_console_conn.py b/tests/common/connections/ssh_console_conn.py index be53b050d9..760f6a1449 100644 --- a/tests/common/connections/ssh_console_conn.py +++ b/tests/common/connections/ssh_console_conn.py @@ -1,7 +1,10 @@ import time import re from .base_console_conn import CONSOLE_SSH_DIGI_CONFIG, BaseConsoleConn, CONSOLE_SSH -from netmiko.ssh_exception import NetMikoAuthenticationException +try: + from netmiko.ssh_exception import NetMikoAuthenticationException +except ImportError: + from netmiko.exceptions import NetMikoAuthenticationException from paramiko.ssh_exception import SSHException diff --git a/tests/common/connections/telnet_console_conn.py b/tests/common/connections/telnet_console_conn.py index e522c221bb..0efbaa545f 100644 --- a/tests/common/connections/telnet_console_conn.py +++ b/tests/common/connections/telnet_console_conn.py @@ -1,7 +1,10 @@ import time import re from .base_console_conn import BaseConsoleConn -from netmiko.ssh_exception import NetMikoAuthenticationException +try: + from netmiko.ssh_exception import NetMikoAuthenticationException +except ImportError: + from netmiko.exceptions import NetMikoAuthenticationException class TelnetConsoleConn(BaseConsoleConn):