diff --git a/src/device/.gitlab-ci.yml b/src/device/.gitlab-ci.yml
index 5337a58006323032e9b6536ac3e5b4e5018e691d..cc5f4c01c882178214d4c2b0083cf3f606e0c028 100644
--- a/src/device/.gitlab-ci.yml
+++ b/src/device/.gitlab-ci.yml
@@ -44,29 +44,52 @@ build_device:
- .gitlab-ci.yml
# Deploy mock QKD nodes
-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:
- - echo "Starting mock QKD nodes deployment..."
- - >
- if docker network list | grep -q teraflowbridge; then
- echo "teraflowbridge network is already created";
+ - 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
- docker network create -d bridge teraflowbridge;
+ 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
- |
- 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;
+ 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
- - MOCK_NODES_DIR="controller/src/tests/tools/mock_qkd_nodes"
- |
- if [ -d "$MOCK_NODES_DIR" ]; then
- cd "$MOCK_NODES_DIR" && ./start.sh &
- else
- echo "Error: Mock QKD nodes directory '$MOCK_NODES_DIR' not found." && exit 1;
+ 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)'
@@ -88,17 +111,15 @@ unit_test_device:
stage: unit_test
needs:
- build_device
- - deploy_mock_qkd_nodes
+ - prepare_mock_qkd_nodes
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
- - docker run --name $IMAGE_NAME --network="host" -d -p 2020:2020 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" -e PYTHONPATH="/var/teraflow:/var/teraflow/device:/var/teraflow/tests/tools/mock_qkd_nodes:/var/teraflow/tests" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
+ - docker run --name $IMAGE_NAME --network=teraflowbridge -d -p 2020:2020 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" -e PYTHONPATH="/var/teraflow:/var/teraflow/device:/var/teraflow/tests/tools/mock_qkd_nodes:/var/teraflow/tests" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"
- sleep 5
- docker ps -a
- docker logs $IMAGE_NAME
- #- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary_emulated.py --junitxml=/opt/results/${IMAGE_NAME}_report_emulated.xml"
- #- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary_ietf_actn.py --junitxml=/opt/results/${IMAGE_NAME}_report_ietf_actn.xml"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose device/tests/qkd/unit/test_qkd_mock_connectivity.py"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose device/tests/qkd/unit/test_qkd_compliance.py"
- docker exec -i $IMAGE_NAME bash -c "coverage run --append -m pytest --log-level=INFO --verbose device/tests/qkd/unit/test_mock_qkd_node.py"
@@ -107,7 +128,11 @@ unit_test_device:
coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script:
- docker rm -f $IMAGE_NAME
+ - docker rm -f pathcomp-frontend pathcomp-backend device context crdb nats
+ - docker volume rm -f crdb
- docker network rm teraflowbridge
+ - docker volume prune --force
+ - docker image prune --force
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"'
@@ -127,25 +152,19 @@ unit_test_device:
junit: src/$IMAGE_NAME/tests/${IMAGE_NAME}_report_*.xml
## Deployment of the service in Kubernetes Cluster
-#deploy device:
+#deploy_device:
# variables:
# IMAGE_NAME: 'device' # name of the microservice
# IMAGE_TAG: 'latest' # tag of the container image (production, development, etc)
# stage: deploy
# needs:
-# - unit test device
-# # - integ_test execute
+# - unit_test_device
# script:
# - 'sed -i "s/$IMAGE_NAME:.*/$IMAGE_NAME:$IMAGE_TAG/" manifests/${IMAGE_NAME}service.yaml'
# - kubectl version
# - kubectl get all
# - kubectl apply -f "manifests/${IMAGE_NAME}service.yaml"
# - kubectl get all
-# # environment:
-# # name: test
-# # url: https://example.com
-# # kubernetes:
-# # namespace: test
# rules:
# - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH)'
# when: manual