Commit 2cade7b1 authored by YannGarcia's avatar YannGarcia
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite

parents c4525fd0 00ca9325

.jenkins.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -vx

set -e

#set -e



cd "$(dirname "$0")"

docker/build-container.sh

+4 −4
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -e
@@ -8,15 +8,15 @@ 
DOCKER_FILE=./docker/Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    docker rm --force stf549_ng112

    docker build --tag stf549_ng112 --force-rm -f ${DOCKER_FILE} .

    docker rm --force stf569_Mec

    docker build --tag stf569_Mec --force-rm -f ${DOCKER_FILE} .

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

        exit -1

    fi

    docker image ls -a

    docker inspect stf549_ng112:latest

    docker inspect stf569_Mec:latest

    if [ "$?" != "0" ]

    then

        echo "Docker inspect failed: $?"

docker/run-container.sh

+3 −3
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright ETSI 2018

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -e

#set -vx



docker run stf549_ng112:latest "/bin/bash" \

docker run stf569_Mec:latest "/bin/bash" \

	-c "source /home/etsi/devenv.bash \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsMec/objs \

	    && ../bin/run_all.bash \

      && ls -ltr ../logs"