aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Alexy <tomas.alexy@pantheon.tech>2021-04-26 17:34:28 +0200
committerPeter Mikus <pmikus@cisco.com>2021-04-27 06:54:34 +0000
commit425a606f9adb93da33a9ce861d0aa09e8c6b0526 (patch)
tree3faa8076e51dafa37cce1ee2d875def0a0d7514a
parent793aa6541012b1e1522b4d3b8a88546558fb22be (diff)
Infra: AWS - add CSIT parameters to bootstrap
Signed-off-by: Tomas Alexy <tomas.alexy@pantheon.tech> Change-Id: I41b5905bcaab303a74d9985283e469922e5fba94
-rw-r--r--fdio.infra.terraform/2n_aws_c5n/variables.tf2
-rw-r--r--fdio.infra.terraform/3n_aws_c5n/variables.tf2
-rw-r--r--resources/libraries/bash/entry/bootstrap_verify_perf.sh3
-rwxr-xr-xresources/libraries/bash/entry/bootstrap_vpp_device.sh3
-rw-r--r--resources/libraries/bash/function/common.sh25
5 files changed, 31 insertions, 4 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/variables.tf b/fdio.infra.terraform/2n_aws_c5n/variables.tf
index 15e718bdb0..c5c74f6d13 100644
--- a/fdio.infra.terraform/2n_aws_c5n/variables.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/variables.tf
@@ -21,7 +21,7 @@ variable "ami_image" {
variable "instance_type" {
description = "AWS instance type"
type = string
- default = "c5n.4xlarge"
+ default = "c5n.9xlarge"
}
variable "testbed_name" {
diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf
index 15e718bdb0..c5c74f6d13 100644
--- a/fdio.infra.terraform/3n_aws_c5n/variables.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/variables.tf
@@ -21,7 +21,7 @@ variable "ami_image" {
variable "instance_type" {
description = "AWS instance type"
type = string
- default = "c5n.4xlarge"
+ default = "c5n.9xlarge"
}
variable "testbed_name" {
diff --git a/resources/libraries/bash/entry/bootstrap_verify_perf.sh b/resources/libraries/bash/entry/bootstrap_verify_perf.sh
index fc3344010b..9c91017303 100644
--- a/resources/libraries/bash/entry/bootstrap_verify_perf.sh
+++ b/resources/libraries/bash/entry/bootstrap_verify_perf.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -46,6 +46,7 @@ archive_tests || die
reserve_and_cleanup_testbed || die
select_tags || die
compose_pybot_arguments || die
+set_environment_variables || die
run_pybot || die
untrap_and_unreserve_testbed || die
move_archives || die
diff --git a/resources/libraries/bash/entry/bootstrap_vpp_device.sh b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
index ef7bb08dfa..95708e888d 100755
--- a/resources/libraries/bash/entry/bootstrap_vpp_device.sh
+++ b/resources/libraries/bash/entry/bootstrap_vpp_device.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -45,6 +45,7 @@ archive_tests || die
activate_docker_topology || die
select_vpp_device_tags || die
compose_pybot_arguments || die
+set_environment_variables || die
run_pybot || die
move_archives || die
die_on_pybot_error || die
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 54a013eeb3..ec95f9227c 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -1138,6 +1138,31 @@ function select_vpp_device_tags () {
done
}
+
+function set_environment_variables () {
+
+ # Depending on testbed topology, overwrite defaults set in the
+ # resources/libraries/python/Constants.py file
+ #
+ # Variables read:
+ # - TEST_CODE - String affecting test selection, usually jenkins job name.
+ # Variables set:
+ # See specific cases
+
+ set -exuo pipefail
+
+ case "${TEST_CODE}" in
+ *"2n-aws"* | *"3n-aws"*)
+ # T-Rex 2.88 workaround for ENA NICs
+ export TREX_RX_DESCRIPTORS_COUNT=1024
+ export TREX_EXTRA_CMDLINE="--mbuf-factor 19"
+ # Settings to prevent duration stretching
+ export PERF_TRIAL_STL_DELAY=0.1
+ ;;
+ esac
+}
+
+
function untrap_and_unreserve_testbed () {
# Use this as a trap function to ensure testbed does not remain reserved.