Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I145a4b5511141f1e2b4e387daa358e32dd2c8015
-csit_dut-ubuntu1804:local
+csit_sut-ubuntu1804:local
QEMU_VM_DPDK = u"/opt/dpdk-20.02"
# Docker container SUT image
QEMU_VM_DPDK = u"/opt/dpdk-20.02"
# Docker container SUT image
- DOCKER_SUT_IMAGE_UBUNTU = u"snergster/csit-sut:latest"
+ DOCKER_SUT_IMAGE_UBUNTU = u"csit_sut-ubuntu1804:local"
# Docker container arm SUT image
# Docker container arm SUT image
- DOCKER_SUT_IMAGE_UBUNTU_ARM = u"snergster/csit-arm-sut:latest"
+ DOCKER_SUT_IMAGE_UBUNTU_ARM = u"csit_sut-ubuntu1804:local"
# TRex install directory
TREX_INSTALL_DIR = u"/opt/trex-core-2.82"
# TRex install directory
TREX_INSTALL_DIR = u"/opt/trex-core-2.82"
else Constants.DOCKER_SUT_IMAGE_UBUNTU
setattr(self.container, u"image", img)
else Constants.DOCKER_SUT_IMAGE_UBUNTU
setattr(self.container, u"image", img)
- cmd = f"docker pull {self.container.image}"
-
- ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800)
- if int(ret) != 0:
- raise RuntimeError(
- f"Failed to create container {self.container.name}."
- )
+ if "/" in self.container.image:
+ cmd = f"docker pull {self.container.image}"
+ ret, _, _ = self.container.ssh.exec_command_sudo(cmd, timeout=1800)
+ if int(ret) != 0:
+ raise RuntimeError(
+ f"Failed to create container {self.container.name}."
+ )
if self.container.cpuset_cpus:
self._configure_cgroup(u"docker")
if self.container.cpuset_cpus:
self._configure_cgroup(u"docker")
tags: csit-sut-image
- name: Build CSIT SUT Docker Image
tags: csit-sut-image
- name: Build CSIT SUT Docker Image
- shell: "docker build -t csit_dut-ubuntu1804:local ."
+ shell: "docker build -t csit_sut-ubuntu1804:local ."
args:
chdir: "/opt/csit-sut"
tags: csit-sut-image
\ No newline at end of file
args:
chdir: "/opt/csit-sut"
tags: csit-sut-image
\ No newline at end of file
tags: kubernetes
- role: kernel_vm
tags: kernel_vm
tags: kubernetes
- role: kernel_vm
tags: kernel_vm
+ - role: csit_sut_image
+ tags: csit_sut_image
- role: performance_tuning
tags: performance_tuning
- role: cleanup
- role: performance_tuning
tags: performance_tuning
- role: cleanup