summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrevortao <trevor.tao@arm.com>2018-05-23 12:42:28 +0800
committerRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-06-22 15:16:04 +0100
commit5e8ccbda5ae7a258eb47b65eb3234979a93053e6 (patch)
tree0a45b70790bd0650f844bccf26dbb88865b6791d
parent9e33d405f33273c26b89f2ecdc49e42f1b560f02 (diff)
Use TRex release v2.41 to support both x86 and aarch64
Currently Yardstick uses Cisco's TRex release v2.28 which can only support x86, for the consideration of multi-arch support of Yardstick, the trex release v2.41 is now available and it can support multi-arch(both x86 and aarch64) now. For the external lib of v2.41, for x86_64, it looks like: external_libs/pyzmq-14.5.0/python2/intel/ucs4/64bit/zmq for arm64, it looks like: external_libs/pyzmq-14.5.0/python2/arm/ucs4/64bit/zmq So replace the trex release v2.28 with v2.41. JIRA: YARDSTICK-1191 Change-Id: I22dc3499283d48a89da1145cc480fd7d2a93a1cc Signed-off-by: trevortao <trevor.tao@arm.com> (cherry picked from commit 13f19d35a04ffb46ca673e81385779bc46c48781)
-rw-r--r--ansible/roles/download_trex/defaults/main.yml3
-rw-r--r--ansible/roles/install_trex/defaults/main.yml2
2 files changed, 3 insertions, 2 deletions
diff --git a/ansible/roles/download_trex/defaults/main.yml b/ansible/roles/download_trex/defaults/main.yml
index 6e8fa7020..cbaae1d84 100644
--- a/ansible/roles/download_trex/defaults/main.yml
+++ b/ansible/roles/download_trex/defaults/main.yml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
---
-trex_version: v2.28
+trex_version: v2.41
trex_url: "https://trex-tgn.cisco.com/trex/release/{{ trex_version }}.tar.gz"
trex_file: "{{ trex_url|basename }}"
trex_unarchive: "{{ trex_file|regex_replace('[.]tar.gz$', '') }}"
@@ -20,3 +20,4 @@ trex_dest: "{{ clone_dest }}/"
trex_sha256s:
"v2.20": "sha256:eb5a069f758a36133a185c7e27af10834ca03d11441165403529fbd7844658fb"
"v2.28": "sha256:c3f08aabbd69dddb09843984d41acbe9ba1af6a6ef3380a7830f7c9e33134207"
+ "v2.41": "sha256:aa4122d82cc7b25a16a20d6dd465eccd89e31c51816d4103765b86d06a8b9810"
diff --git a/ansible/roles/install_trex/defaults/main.yml b/ansible/roles/install_trex/defaults/main.yml
index a5555e355..79a04fedd 100644
--- a/ansible/roles/install_trex/defaults/main.yml
+++ b/ansible/roles/install_trex/defaults/main.yml
@@ -13,6 +13,6 @@
# limitations under the License.
---
#TREX_DOWNLOAD: "https://trex-tgn.cisco.com/trex/release/v2.05.tar.gz"
-TREX_VERSION: v2.28
+TREX_VERSION: v2.41
TREX_DOWNLOAD: "{{ nsb_mirror_url|ternary(nsb_mirror_url, 'https://trex-tgn.cisco.com/trex/release' }}/{{ TREX_VERSION }}.tar.gz"
INSTALL_BIN_PATH: "/opt/nsb_bin"