Commit 84ed1a77 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Renaming docker images required for validating TTCN-3 and Robot test suites

parent 1ca4b082

.gitlab-ci.yml

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ Build stfubuntu docker image: 
Build TTCN-3 Test Suite docker image:

Build TTCN-3 Test Suite docker image:

  stage: build

  stage: build

  before_script: cd GS32-3

  before_script: cd GS32-3

  script: docker build -t etsiforge/mec-ts .

  script: docker build -t etsiforge/mec-ttcn3-ts .

  rules:

  rules:

    - changes:

    - changes:

        - GS32-3/Dockerfile

        - GS32-3/Dockerfile
@@ -27,7 +27,7 @@ Build TTCN-3 Test Suite docker image: 
Build Robot Test Suite docker image:

Build Robot Test Suite docker image:

  stage: build

  stage: build

  before_script: cd GS32-3

  before_script: cd GS32-3

  script: docker build -t etsiforge/mec-ts -f Dockerfile.robot-ts .

  script: docker build -t etsiforge/mec-robot-ts -f Dockerfile.robot-ts .

  rules:

  rules:

    - changes:

    - changes:

        - GS32-3/Dockerfile.robot-ts

        - GS32-3/Dockerfile.robot-ts

GS32-3/.gitlab-ci-robot-ts.yml

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ Validate MEC Robot Test Suite: 
  stage: validation

  stage: validation

  script:

  script:

    - echo 'Validate MEC Robot Test Suite'

    - echo 'Validate MEC Robot Test Suite'

    - docker run -v "$(pwd):/home/etsi/dev/robot" -u $(id -u):$(id -g) etsiforge/mec-ts:latest "/bin/bash" -c  "/home/etsi/dev/scripts/validate.sh $CI_COMMIT_BRANCH"

    - docker run -v "$(pwd):/home/etsi/dev/robot" -u $(id -u):$(id -g) etsiforge/mec-robot-ts:latest "/bin/bash" -c  "/home/etsi/dev/scripts/validate.sh $CI_COMMIT_BRANCH"

    #- docker run -v "$(pwd):/home/etsi/dev/robot" -u $(id -u):$(id -g) etsiforge/mec-ts:latest "/bin/bash" -c  "cd /home/etsi/dev/robot && sh scripts/run-all.bash && ls -ltr logs/"

    #- docker run -v "$(pwd):/home/etsi/dev/robot" -u $(id -u):$(id -g) etsiforge/mec-ts:latest "/bin/bash" -c  "cd /home/etsi/dev/robot && sh scripts/run-all.bash && ls -ltr logs/"

      

      

# Generate API Robot Test Suite docx:

# Generate API Robot Test Suite docx:

GS32-3/.gitlab-ci.yml

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

    - set -vx

  script:

  script:

    - echo 'Running tests'

    - 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/mec-ttcn3-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:

  rules:

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