Change-Id: I84f13d7139a6e5f7004426018c2d27425c5fa97e
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>
--- /dev/null
+snergster/csit-sut-arm-ubuntu18:latest
get_test_code "${1-}" || die
get_test_tag_string || die
select_topology || die
get_test_code "${1-}" || die
get_test_tag_string || die
select_topology || die
gather_build || die
check_download_dir || die
activate_virtualenv || die
gather_build || die
check_download_dir || die
activate_virtualenv || die
get_test_code "${1-}" || die
get_test_tag_string || die
select_topology || die
get_test_code "${1-}" || die
get_test_tag_string || die
select_topology || die
gather_build || die
check_download_dir || die
activate_virtualenv || die
gather_build || die
check_download_dir || die
activate_virtualenv || die
get_test_tag_string || die
set_perpatch_dut || die
select_topology || die
get_test_tag_string || die
set_perpatch_dut || die
select_topology || die
select_build "build_current" || die
check_download_dir || die
activate_virtualenv "${VPP_DIR}" || die
select_build "build_current" || die
check_download_dir || die
activate_virtualenv "${VPP_DIR}" || die
get_test_tag_string || die
set_perpatch_dut || die
select_topology || die
get_test_tag_string || die
set_perpatch_dut || die
select_topology || die
activate_virtualenv "${VPP_DIR}" || die
generate_tests || die
archive_tests || die
activate_virtualenv "${VPP_DIR}" || die
generate_tests || die
archive_tests || die
+function select_arch_os () {
# Populate variables related to local operating system.
#
# Populate variables related to local operating system.
#
- die "Unable to identify distro or os from ${OS}"
+ die "Unable to identify distro or os from ${os_id}"
+ ;;
+ esac
+
+ arch=$(uname -m) || {
+ die "Get CPU architecture failed."
+ }
+
+ case "${arch}" in
+ "aarch64")
+ IMAGE_VER_FILE="${IMAGE_VER_FILE}_ARM"
+ ;;
+ *)
# Docker container SUT image
DOCKER_SUT_IMAGE_UBUNTU = 'snergster/csit-sut:latest'
# Docker container SUT image
DOCKER_SUT_IMAGE_UBUNTU = 'snergster/csit-sut:latest'
+ # Docker container arm SUT image
+ DOCKER_SUT_IMAGE_UBUNTU_ARM = 'snergster/csit-sut-arm-ubuntu18:latest'
+
# TRex install version
TREX_INSTALL_VERSION = '2.54'
# TRex install version
TREX_INSTALL_VERSION = '2.54'
+ target_arch = 'arm64' \
+ if Topology.get_node_arch(self.container.node) == 'aarch64' \
+ else 'amd64'
+
image = self.container.image if self.container.image else\
image = self.container.image if self.container.image else\
- "-d ubuntu -r bionic -a amd64"
+ "-d ubuntu -r bionic -a {arch}".format(arch=target_arch)
cmd = 'lxc-create -t download --name {c.name} -- {image} '\
'--no-validate'.format(c=self.container, image=image)
cmd = 'lxc-create -t download --name {c.name} -- {image} '\
'--no-validate'.format(c=self.container, image=image)
return
if not self.container.image:
return
if not self.container.image:
- setattr(self.container, 'image',
- Constants.DOCKER_SUT_IMAGE_UBUNTU)
+ img = Constants.DOCKER_SUT_IMAGE_UBUNTU_ARM \
+ if Topology.get_node_arch(self.container.node) == 'aarch64' \
+ else Constants.DOCKER_SUT_IMAGE_UBUNTU
+ setattr(self.container, 'image', img)
cmd = 'docker pull {image}'.format(image=self.container.image)
cmd = 'docker pull {image}'.format(image=self.container.image)
if int(ret) != 0:
raise RuntimeError('Failed to create container {c.name}.'
.format(c=self.container))
if int(ret) != 0:
raise RuntimeError('Failed to create container {c.name}.'
.format(c=self.container))
if self.container.cpuset_cpus:
self._configure_cgroup('docker')
if self.container.cpuset_cpus:
self._configure_cgroup('docker')