- && wget --no-cache https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \
- && tar xzf $TREX_VER.tar.gz -C /opt/trex \
+ && mkdir /tmp/trex \
+ && wget --no-cache https://github.com/cisco-system-traffic-generator/trex-core/archive/$TREX_VER.tar.gz \
+ && tar xzf $TREX_VER.tar.gz --strip-components=1 -C /tmp/trex \
- && rm -f /opt/trex/$TREX_VER/trex_client_$TREX_VER.tar.gz \
- && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
+ && cp -a /tmp/trex/scripts/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
+ && cp -a /tmp/trex/scripts/* /opt/trex/$TREX_VER/ \
&& git clone https://gerrit.opnfv.org/gerrit/nfvbench \
&& cd /nfvbench && pip3 install -e . \
&& wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
&& git clone https://gerrit.opnfv.org/gerrit/nfvbench \
&& cd /nfvbench && pip3 install -e . \
&& wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
&& python3 ./docker/cleanup_generators.py \
&& rm -rf /nfvbench/.git \
&& apt-get remove -y wget git \
&& python3 ./docker/cleanup_generators.py \
&& rm -rf /nfvbench/.git \
&& apt-get remove -y wget git \