Commit 5903745d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge cleanup

parent de963e74

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -59,4 +59,4 @@ include: 
  #- local: '/src/osm_client/.gitlab-ci.yml'



  # This should be last one: end-to-end integration tests

  - local: '/src/tests/.gitlab-ci.yml'
 
  #- local: '/src/tests/.gitlab-ci.yml'

src/device/.gitlab-ci.yml

+1 −61
Original line number Diff line number Diff line
@@ -40,66 +40,6 @@ build device: 
      - manifests/${IMAGE_NAME}service.yaml

      - .gitlab-ci.yml



## Deploy mock QKD nodes

#prepare_mock_qkd_nodes:

#  stage: prepare

#  before_script:

#    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

#    - if docker network list | grep teraflowbridge; then echo "teraflowbridge network is already created"; else docker network create --driver=bridge teraflowbridge; fi

#    - |

#      # Context-related cleanup

#      if docker container ls | grep crdb; then docker rm -f crdb; else echo "CockroachDB container is not in the system"; fi

#      if docker volume ls | grep crdb; then docker volume rm -f crdb; else echo "CockroachDB volume is not in the system"; fi

#      if docker container ls | grep nats; then docker rm -f nats; else echo "NATS container is not in the system"; fi

#

#  script:

#    - docker volume create crdb

#    - docker run --name crdb -d --network=teraflowbridge -p 26257:26257 -p 8080:8080 cockroachdb/cockroach:latest-v22.2 start-single-node

#    - docker run --name nats -d --network=teraflowbridge -p 4222:4222 -p 8222:8222 nats:2.9 --http_port 8222 --user tfs --pass tfs123

#    - echo "Waiting for initialization..."

#    - while ! docker logs crdb 2>&1 | grep -q 'finished creating default user "tfs"'; do sleep 1; done

#    - while ! docker logs nats 2>&1 | grep -q 'Server is ready'; do sleep 1; done

#    - MOCK_NODES_DIR="$CI_PROJECT_DIR/controller/src/tests/tools/mock_qkd_nodes"

#    - |

#      if [ -d "$MOCK_NODES_DIR" ]; then

#        cd "$MOCK_NODES_DIR" && ./start.sh &

#        MOCK_NODES_PID=$!

#      else

#        echo "Error: Mock QKD nodes directory '$MOCK_NODES_DIR' not found." && exit 1;

#      fi

#    - echo "Waiting for mock nodes to be up..."

#    - RETRY_COUNT=0

#    - MAX_RETRIES=15

#    - |

#      while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do

#        if curl -s http://127.0.0.1:11111 > /dev/null && \

#           curl -s http://127.0.0.1:22222 > /dev/null && \

#           curl -s http://127.0.0.1:33333 > /dev/null; then

#            echo "Mock nodes are up!"

#            break

#        else

#            echo "Mock nodes not ready, retrying in 5 seconds..."

#            RETRY_COUNT=$((RETRY_COUNT + 1))

#            sleep 5

#        fi

#      done

#    - |

#      if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then

#        echo "Error: Mock nodes failed to start after multiple attempts."

#        exit 1

#      fi

#  rules:

#    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'

#    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "develop"'

#    - changes:

#        - src/common/**/*.py

#        - proto/*.proto

#        - src/device/**/*.{py,in,yml}

#        - src/device/Dockerfile

#        - src/device/tests/*.py

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

#        - .gitlab-ci.yml



# Apply unit test to the component

unit_test device:

  variables:
@@ -164,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

+47 −95
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ unit_test service: 
      docker run --name nats -d --network=teraflowbridge -p 4222:4222 -p 8222:8222

      nats:2.9 --http_port 8222 --user tfs --pass tfs123

    - echo "Waiting for initialization..."

    - while ! docker logs crdb 2>&1 | grep -q 'finished creating default user "tfs"'; do sleep 1; done

    - while ! docker logs crdb 2>&1 | grep -q 'finished creating default user \"tfs\"'; do sleep 1; done

    - docker logs crdb

    - while ! docker logs nats 2>&1 | grep -q 'Server is ready'; do sleep 1; done

    - docker logs nats
@@ -95,110 +95,62 @@ unit_test service: 
    - echo $CRDB_ADDRESS

    - NATS_ADDRESS=$(docker inspect nats --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $NATS_ADDRESS



    # Context Service Preparation

    - |

      docker run --name context -d -p 1010:1010 \

      --env "CRDB_URI=cockroachdb://tfs:tfs123@${CRDB_ADDRESS}:26257/tfs_test?sslmode=require" \

      --env "MB_BACKEND=nats" \

      --env "NATS_URI=nats://tfs:tfs123@${NATS_ADDRESS}:4222" \

      --network=teraflowbridge \

    - >

      docker run --name context -d -p 1010:1010

      --env "CRDB_URI=cockroachdb://tfs:tfs123@${CRDB_ADDRESS}:26257/tfs_test?sslmode=require"

      --env "MB_BACKEND=nats"

      --env "NATS_URI=nats://tfs:tfs123@${NATS_ADDRESS}:4222"

      --network=teraflowbridge

      $CI_REGISTRY_IMAGE/context:$IMAGE_TAG

      CONTEXTSERVICE_SERVICE_HOST=$(docker inspect context --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

      echo $CONTEXTSERVICE_SERVICE_HOST

    - 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}" \

      --network=teraflowbridge \

    - >

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

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"

      --network=teraflowbridge

      $CI_REGISTRY_IMAGE/device:$IMAGE_TAG

      DEVICESERVICE_SERVICE_HOST=$(docker inspect device --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

      echo $DEVICESERVICE_SERVICE_HOST

    - 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 \

    - >

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

      --network=teraflowbridge

      $CI_REGISTRY_IMAGE/pathcomp-backend:$IMAGE_TAG

      PATHCOMP_BACKEND_HOST=$(docker inspect pathcomp-backend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

      echo $PATHCOMP_BACKEND_HOST

      sleep 1

      docker run --name pathcomp-frontend -d -p 10020:10020 \

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}" \

      --env "PATHCOMP_BACKEND_HOST=${PATHCOMP_BACKEND_HOST}" \

      --env "PATHCOMP_BACKEND_PORT=8081" \

      --network=teraflowbridge \

    - PATHCOMP_BACKEND_HOST=$(docker inspect pathcomp-backend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

    - echo $PATHCOMP_BACKEND_HOST

    - sleep 1

    - >

      docker run --name pathcomp-frontend -d -p 10020:10020

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"

      --env "PATHCOMP_BACKEND_HOST=${PATHCOMP_BACKEND_HOST}"

      --env "PATHCOMP_BACKEND_PORT=8081"

      --network=teraflowbridge

      $CI_REGISTRY_IMAGE/pathcomp-frontend:$IMAGE_TAG

      sleep 1

      PATHCOMPSERVICE_SERVICE_HOST=$(docker inspect pathcomp-frontend --format "{{.NetworkSettings.Networks.teraflowbridge.IPAddress}}")

      echo $PATHCOMPSERVICE_SERVICE_HOST

    - sleep 1

    - 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}" \

      --env "DEVICESERVICE_SERVICE_HOST=${DEVICESERVICE_SERVICE_HOST}" \

      --env "PATHCOMPSERVICE_SERVICE_HOST=${PATHCOMPSERVICE_SERVICE_HOST}" \

      --volume "$PWD/src/$IMAGE_NAME/tests:/opt/results" \

      --network=teraflowbridge \

    - >

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

      --env "CONTEXTSERVICE_SERVICE_HOST=${CONTEXTSERVICE_SERVICE_HOST}"

      --env "DEVICESERVICE_SERVICE_HOST=${DEVICESERVICE_SERVICE_HOST}"

      --env "PATHCOMPSERVICE_SERVICE_HOST=${PATHCOMPSERVICE_SERVICE_HOST}"

      --volume "$PWD/src/$IMAGE_NAME/tests:/opt/results"

      --network=teraflowbridge

      $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

      sleep 5

      docker ps -a

      docker logs context

      docker logs device

      docker logs pathcomp-frontend

      docker logs pathcomp-backend

      docker logs $IMAGE_NAME



    # Mock QKD Nodes Deployment

    - |

      echo "Starting stage: deploy_mock_nodes"

    - pip install flask  # Install Flask to ensure it is available

    - |

      for port in 11111 22222 33333; do

        if lsof -i:$port >/dev/null 2>&1; then

          echo "Freeing up port $port..."

          fuser -k $port/tcp

        fi

      done

      MOCK_NODES_DIR="$PWD/src/tests/tools/mock_qkd_nodes"

      if [ -d "$MOCK_NODES_DIR" ]; then

        cd "$MOCK_NODES_DIR" || exit

        ./start.sh &

        MOCK_NODES_PID=$!

      else

        echo "Error: Mock QKD nodes directory '$MOCK_NODES_DIR' not found."

        exit 1

      fi

      echo "Waiting for mock nodes to be up..."

      RETRY_COUNT=0

      MAX_RETRIES=15

      while [ $RETRY_COUNT -lt $MAX_RETRIES ]; do

        if curl -s http://127.0.0.1:11111 > /dev/null && \

           curl -s http://127.0.0.1:22222 > /dev/null && \

           curl -s http://127.0.0.1:33333 > /dev/null; then

            echo "Mock nodes are up!"

            break

        else

            echo "Mock nodes not ready, retrying in 5 seconds..."

            RETRY_COUNT=$((RETRY_COUNT + 1))

            sleep 5

        fi

      done

      if [ $RETRY_COUNT -ge $MAX_RETRIES ]; then

        echo "Error: Mock nodes failed to start after multiple attempts."

        exit 1

      fi

    - sleep 5

    - docker ps -a

    - docker logs context

    - docker logs device

    - docker logs pathcomp-frontend

    - docker logs pathcomp-backend

    - docker logs $IMAGE_NAME



    # Run the tests

    - |

      docker exec -i $IMAGE_NAME bash -c \

      "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

      docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"



    # Run QKD Bootstrap Test

    - docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose service/tests/qkd/test_functional_bootstrap.py"

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

    #- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose service/tests/qkd/test_functional_bootstrap.py"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"



  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script: