Commit 2f10b7db authored by garciay's avatar garciay
Browse files

Validate README.md

parent 56689779

.jenkins.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#set -vx

set -e



cd "$(dirname "$0")"

cd "${dirname "$0"}"



run_dir="$(pwd)"

README.md

+5 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ NOTE The creation and the installations will take some time to achieve 


```sh

$ ./docker/run-container.sh

# su - etsi

...

```



- Switch to the next clause (Usage)
@@ -175,7 +175,8 @@ The procedures below illustrate how to run the CAM test suite. The same procedur 


Pre-requisites:

- Your machine is installed followimg one of the installation method describes in the previous clause

- Your are logged as 'etsi' user

- Refer to the ETSU TS 103 099 for the description of the Test System architecture and configuration

- Your are logged as 'etsi' or 'vagrant' user



Procedure using Eclipse TITAN:
@@ -190,7 +191,7 @@ Procedure in TITAN command line: 


```sh

$ ../bin/run-all.bash

# su - etsi

...

```



- The log files are located in ../logs folder. Yu can edit them using any editor or using the Eclipse TITAN log plugins
@@ -203,7 +204,7 @@ A specific version of Wireshark, based on official version 2.6.x, is available [ 


The following Pre-requisites applies to build it:

- Your machine is installed followimg one of the installation method describes in the previous clause

- Your are logged as 'etsi' user

- Your are logged as 'etsi' or 'vagrant' user



The following procedure applies to build it:

- Open a SSH session (PuTTY...)

Vagrant/provisioner.bash

+8 −10
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common - 
sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y

sudo DEBIAN_FRONTEND=noninteractive apt-get update

sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs openjdk-11-jre gcc-8 g++-8 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libncurses5-dev expect libssl-dev libxml2-dev xutils-dev tcpdump libpcap-dev libwireshark-dev wget tree unzip sshpass kubuntu-desktop valgrind qt5-default qtmultimedia5-dev libqt5svg5-dev -y

# Install java

#sudo DEBIAN_FRONTEND=noninteractive apt-get install oracle-java9-installer oracle-java9-set-default -y

#sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install oracle-java10-installer oracle-java10-set-default -y

#sudo DEBIAN_FRONTEND=noninteractive apt --fix-broken install -y

sudo DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y
@@ -121,10 +123,6 @@ sudo gem install coveralls-lcov 
lcov --version

coveralls-lcov -h



# Install java

sudo DEBIAN_FRONTEND=noninteractive apt-get install oracle-java9-installer oracle-java9-set-default -y

java --version



# Install eclipse

cd ${HOME_FRAMEWORKS}
@@ -139,12 +137,12 @@ then 
    svn co --username $USERNAME --password $PASSWORD --non-interactive https://oldforge.vagrant.org/svn/ITS/branches/STF525

fi



echo "" >> /etc/profile 

echo "export HOME=/home/etsi" >> /etc/profile 

echo "export LD_LIBRARY_PATH=/home/etsi/TriesAndDelete/etsi_its/lib:$LD_LIBRARY_PATH" >> /etc/profile 

echo "export PATH=/home/etsi/bin:$PATH" >> /etc/profile 

echo "cd /home/etsi" >> /etc/profile 

echo ". ./devenv.bash" >> /etc/profile 

sudo echo "" >> /etc/profile 

sudo echo "export HOME=/home/etsi" >> /etc/profile 

sudo echo "export LD_LIBRARY_PATH=/home/etsi/TriesAndDelete/etsi_its/lib:$LD_LIBRARY_PATH" >> /etc/profile 

sudo echo "export PATH=/home/etsi/bin:$PATH" >> /etc/profile 

sudo echo "cd /home/etsi" >> /etc/profile 

sudo echo ". ./devenv.bash" >> /etc/profile 



cd /home/vagrant/dev/STF525_Its/scripts

./build_titan.bash

docker/Dockerfile

+17 −24
Original line number Diff line number Diff line 
FROM gcc:latest

FROM ubuntu:18.04



MAINTAINER STF525

MAINTAINER ETSI STF 525



LABEL description="STF525 Docker Image"
@@ -26,10 +26,12 @@ RUN echo "docker-titan" > /etc/hostname \ 
      emacs \

      expect \

      flex \

      graphviz \

      g++-8 \

      gcc-8 \

      gdb \ 

      git-core \

      gnutls-bin \

      graphviz \

      libglib2.0-dev \

      libpcap-dev \

      libgcrypt-dev \
@@ -59,42 +61,33 @@ RUN echo "docker-titan" > /etc/hostname \ 
      wget \

    && DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \

    && DEBIAN_FRONTEND=noninteractive apt-get autoclean \

    && java -version \

    && useradd --create-home --shell /bin/bash etsi \

    && echo "etsi:etsi" | chpasswd \

    && adduser etsi sudo \

    && su - etsi \

    && whoami \

    && cd /home/etsi \

    && echo "" >> /etc/profile \

    && echo "export HOME=/home/etsi" >> /etc/profile \

    && echo "export LD_LIBRARY_PATH=/home/etsi/TriesAndDelete/etsi_its/lib:$LD_LIBRARY_PATH" >> /etc/profile \

    && echo "export PATH=/home/etsi/bin:$PATH" >> /etc/profile \

    && echo "cd /home/etsi" >> /etc/profile \

    && echo ". ./devenv.bash" >> /etc/profile 



USER etsi



RUN cd /home/etsi \

    && mkdir -p bin lib include tmp frameworks docs dev \

    && cd /home/etsi/dev \

    && svn co --username $USERNAME --password $PASSWORD --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

    && cd /home/etsi/dev/STF525_Its/scripts \

    && chmod 775 *.bash devenv.bash.* \

    && cd /home/etsi/dev/STF525_Its/docker \

    && chmod 775 *.sh \

    && cd /home/etsi/dev/STF525_Its/ \

    && chmod 775 ./.jenkins.sh \

    && cd /home/etsi \

    && ln -sf /home/etsi/dev/STF525_Its/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash \

    && ls -ltr /home/etsi \

    && export HOME=/home/etsi \

    && . /home/etsi/devenv.bash \

    && cd /home/etsi/frameworks \

    && wget 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && echo "" >> /etc/profile \

    && echo "export HOME=/home/etsi" >> /etc/profile \

    && echo "export LD_LIBRARY_PATH=/home/etsi/TriesAndDelete/etsi_its/lib:$LD_LIBRARY_PATH" >> /etc/profile \

    && echo "export PATH=/home/etsi/bin:$PATH" >> /etc/profile \

    && echo "cd /home/etsi" >> /etc/profile \

    && echo ". ./devenv.bash" >> /etc/profile \

    && cd /home/etsi/STF525_Its/scripts \

    && ./build_titan.bash \

    && cd /home/etsi \

    && . /home/etsi/devenv.bash \

    && cd /home/etsi/STF525_Its/scripts \



    && cd /home/etsi/dev/STF525_Its/scripts 





CMD ["/bin/bash"]

docker/build-container.sh

+30 −33
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
set -e

set -vx



USERNAME=garciay

PASSWORD=d08dga510



DOCKER_FILE=./Dockerfile

if [ -f ${DOCKER_FILE} ]

then

docker/run-container.sh

+11 −11

File changed.

Contains only whitespace changes.