Commit 64a275a3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in scripts

parent f2a79323

5GCORE_NGAP/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ Running tests: 
    - set -vx

  script:

    - echo 'Running tests'

    - docker run --interactive --tty --rm --publish 2222:22 --env DISPLAY=$DISPLAY --volume /tmp/.X11-unix:/tmp/.X11-unix --cap-add=NET_RAW --cap-add=NET_ADMIN etsiforge/mec-ts /bin/bash -c "export ATS=AtsMec && cd ~ && . ./devenv.bash && sed --in-place 's/sbxpl1eil4/sbxrsvoat/g' ~/dev/mec_devel/etc/AtsMec/AtsMec.cfg && cd ~/dev/mec_devel/scripts && ./run_all.bash"

    - docker run --interactive --tty --rm --publish 2222:22 --env DISPLAY=$DISPLAY --volume /tmp/.X11-unix:/tmp/.X11-unix --cap-add=NET_RAW --cap-add=NET_ADMIN etsiforge/int-ts /bin/bash -c "export ATS=AtsMec && cd ~ && . ./devenv.bash && sed --in-place 's/sbxpl1eil4/sbxrsvoat/g' ~/dev/mec_devel/etc/AtsMec/AtsMec.cfg && cd ~/dev/mec_devel/scripts && ./run_all.bash"

  rules:

    - if: $ENVIRONMENT_ENABLED == "True"
 
 No newline at end of file

5GCORE_NGAP/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ FROM etsiforge/stfubuntu:20.04 


MAINTAINER ETSI INT 5G CORE



LABEL description="TTF_T033_Mec Docker Image"

LABEL description="INT TS Docker Image"



ENV TERM=linux \

    HOME=/home/etsi \

    HOSTNAME=docker-titan-TTF_T033

    HOSTNAME=docker-titan-int-ts



COPY home /home/etsi

5GCORE_NGAP/home/etc/init.d/40-devel.sh

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ cd - 


echo -e "*****************************\n* Build Mec test suite\n*****************************\n"

cd ${HOME}/dev/ngap_devel

export ATS_LIST="AtsMec_Location AtsMec_Rnis AtsMec_TrafficManagement AtsMec_UEidentity AtsMec_WlanInformation AtsMec_V2XInformationService"

export ATS_LIST="AtsNGAP"

for i in ${ATS_LIST}

do

    export ATS=$i
@@ -37,8 +37,8 @@ do 
done

rm -fr ./build || exit 1



cd ./etc/AtsMec_Location

ln -sf AtsMec_Sandbox.cf_ AtsMec_Location.cfg

cd ./etc/AtsNGAP

ln -sf AtsNGAP_GNB.cfg_ AtsNGAP.cfg



echo -e "*****************************\n* Change sudo in command line\n*****************************\n"

cd ${HOME}/dev/ngap_devel/scripts