Commit c6244be4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge cleanup

parent 5903745d

src/device/.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ unit_test device: 
      - src/$IMAGE_NAME/Dockerfile

      - src/$IMAGE_NAME/tests/*.py

      - src/$IMAGE_NAME/tests/Dockerfile

      - src/tests/tools/mock_qkd_nodes/**

      #- src/tests/tools/mock_qkd_nodes/**

      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml

  artifacts:
@@ -104,7 +104,7 @@ unit_test device: 
#    IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)

#  stage: deploy

#  needs:

#    - unit_test device

#    - unit test device

#    # - integ_test execute

#  script:

#    - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'

src/service/.gitlab-ci.yml

+6 −3
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ unit_test service: 
    - CONTEXTSERVICE_SERVICE_HOST=$(docker inspect context --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $CONTEXTSERVICE_SERVICE_HOST



    # Device preparation

    - >

      docker run --name device -d -p 2020:2020

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"
@@ -113,6 +114,7 @@ unit_test service: 
    - DEVICESERVICE_SERVICE_HOST=$(docker inspect device --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $DEVICESERVICE_SERVICE_HOST



    # PathComp preparation

    - >

      docker run --name pathcomp-backend -d -p 8081:8081

      --network=teraflowbridge
@@ -131,6 +133,7 @@ unit_test service: 
    - PATHCOMPSERVICE_SERVICE_HOST=$(docker inspect pathcomp-frontend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $PATHCOMPSERVICE_SERVICE_HOST



    # Service preparation

    - >

      docker run --name $IMAGE_NAME -d -p 3030:3030

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"