diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2018-03-22 05:43:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-22 05:43:34 +0000 |
| commit | a9655607f7618fd392cf719e8d9ea2dbf6c8dd1c (patch) | |
| tree | 8f4a3c127ae52ce5207330dc30a1b1fd674fa0c5 | |
| parent | 82a17a3d7c59a49105d6f3b2e4044ab19f77b0a0 (diff) | |
| parent | 035f33c80c9dd875dbbf134bd2d507a0e83218d1 (diff) | |
Merge "trex: Update T-Rex to v2.38"
| -rw-r--r-- | docs/testing/user/configguide/trafficgen.rst | 7 | ||||
| -rw-r--r-- | src/package-list.mk | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/docs/testing/user/configguide/trafficgen.rst b/docs/testing/user/configguide/trafficgen.rst index 4909c55a..52b1b4a5 100644 --- a/docs/testing/user/configguide/trafficgen.rst +++ b/docs/testing/user/configguide/trafficgen.rst @@ -745,11 +745,14 @@ You can directly download from GitHub: git clone https://github.com/cisco-system-traffic-generator/trex-core -and use the master branch: +and use the same Trex version for both server and client API. + +**NOTE:** The Trex API version used by VSPERF is defined by variable ``TREX_TAG`` +in file ``src/package-list.mk``. .. code-block:: console - git checkout master + git checkout v2.38 or Trex latest release you can download from here: diff --git a/src/package-list.mk b/src/package-list.mk index 7b82ee6f..d32a9ffd 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -29,4 +29,4 @@ QEMU_TAG ?= v2.9.1 # TREX section TREX_URL ?= https://github.com/cisco-system-traffic-generator/trex-core.git -TREX_TAG ?= 8bf9c16556843e55c232b64d9a5061bf588fad42 +TREX_TAG ?= v2.38 |