From 0f187ebc52b0eb959c0065ad3b67d8a81d273820 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 18 Mar 2021 08:36:38 +0000 Subject: Infra: Shared TG Ansible rules Signed-off-by: pmikus Change-Id: I7d505d99003c4ab48b191c1d534513768d03bc83 --- .../ansible/roles/tg/files/csit-initialize-docker-tg.sh | 4 ++-- resources/tools/testbed-setup/ansible/tg.yaml | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh b/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh index 7b90d20bda..1192feeee9 100755 --- a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh +++ b/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh @@ -24,7 +24,7 @@ case "${1:-start}" in docker network create --driver bridge csit-nw-tg${cnt} || true # If the IMAGE is not already loaded then docker run will pull the # IMAGE, and all image dependencies, before it starts the container. - dcr_image="snergster/csit-sut:latest" + dcr_image="csit_sut-ubuntu2004:local" # Run the container in the background and print the new container # ID. dcr_stc_params="--detach=true " @@ -33,7 +33,7 @@ case "${1:-start}" in # containers. dcr_stc_params+="--privileged " # Publish all exposed ports to random ports on the host interfaces. - dcr_stc_params+="--publish 600${cnt}:22 " + dcr_stc_params+="--publish 600${cnt}:2222 " # Automatically remove the container when it exits. dcr_stc_params+="--rm " # Size of /dev/shm. diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml index 38ea8227e8..69728a694e 100644 --- a/resources/tools/testbed-setup/ansible/tg.yaml +++ b/resources/tools/testbed-setup/ansible/tg.yaml @@ -22,14 +22,16 @@ tags: mellanox - role: docker tags: docker - - role: tg - tags: tg - role: iperf tags: iperf - role: trex tags: trex - role: ab tags: ab + - role: tg + tags: tg + - role: csit_sut_image + tags: csit_sut_image - role: performance_tuning tags: performance_tuning - role: cleanup -- cgit 1.2.3-korg