summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorfmenguy <francoisregis.menguy@orange.com>2020-02-11 11:07:52 +0100
committerfmenguy <francoisregis.menguy@orange.com>2020-04-07 18:21:52 +0200
commitae6e172471fef8bef60d497eedaf199966ffb799 (patch)
tree3ba93c7614b028ab3c3225c502eeca3885d56af7 /docker
parentce2525c2a621af3d20fc58f03a8f88d29e0e3617 (diff)
NFVBENCH-160 xtesting integration4.2.2.2
Change-Id: Id600a1277059e84bc2d46fa20294fb22729f9c1f Signed-off-by: fmenguy <francoisregis.menguy@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile14
-rwxr-xr-xdocker/nfvbench-entrypoint.sh10
2 files changed, 17 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1cb7c71..cdd7f92 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,14 +23,16 @@ RUN apt-get update && apt-get install -y \
iproute2 \
libelf1 \
&& ln -s /usr/bin/python3.6 /usr/local/bin/python3 \
- && mkdir -p /opt/trex \
+ && mkdir -p /opt/trex/$TREX_VER \
&& mkdir /var/log/nfvbench \
- && 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 /$TREX_VER.tar.gz \
- && 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/ \
&& rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
+ && rm -rf /tmp/trex \
&& wget https://bootstrap.pypa.io/get-pip.py \
&& python3 get-pip.py \
&& pip3 install -U pbr \
@@ -39,6 +41,8 @@ RUN apt-get update && apt-get install -y \
&& 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 \
+ # Override Xtesting testcases.yaml file by NFVbench default one
+ && cp xtesting/testcases.yaml /usr/local/lib/python3.6/dist-packages/xtesting/ci/testcases.yaml \
&& python3 ./docker/cleanup_generators.py \
&& rm -rf /nfvbench/.git \
&& apt-get remove -y wget git \
diff --git a/docker/nfvbench-entrypoint.sh b/docker/nfvbench-entrypoint.sh
index a7195a3..812816d 100755
--- a/docker/nfvbench-entrypoint.sh
+++ b/docker/nfvbench-entrypoint.sh
@@ -13,9 +13,15 @@
# License for the specific language governing permissions and limitations
# under the License.
#
-
-if [ -z "$1" ] || [ $1 != 'start_rest_server' ]; then
+if [ -z "$1" ] || ([ $1 != 'start_rest_server' ] && [ $1 != 'run_tests' ]); then
tail -f /dev/null
+elif [ $1 == 'run_tests' ]; then
+ PARAMS=""
+ for var in "${@:2}"
+ do
+ PARAMS+="$var "
+ done
+ eval "run_tests $PARAMS"
else
PARAMS="--server"
if [ -n "$HOST" ]; then