aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-03-18 08:36:38 +0000
committerpmikus <pmikus@cisco.com>2021-03-18 08:36:38 +0000
commit0f187ebc52b0eb959c0065ad3b67d8a81d273820 (patch)
tree7c82bbcac3f31c6fe8bd4d8345593209f30d86d6
parent152ee3cf5074bdfe0ac650a11d49c81db1f86e7f (diff)
Infra: Shared TG Ansible rules
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I7d505d99003c4ab48b191c1d534513768d03bc83
-rwxr-xr-xresources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh4
-rw-r--r--resources/tools/testbed-setup/ansible/tg.yaml6
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