Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Commits
3fcbe991
Commit
3fcbe991
authored
10 months ago
by
Alberto Gonzalez Barneo
Browse files
Options
Downloads
Patches
Plain Diff
Modified gitlab-ci.yml to autoexecute the qkd test creating at the beginning the mocked qkd nodes
parent
9b17d6a6
No related branches found
No related tags found
2 merge requests
!294
Release TeraFlowSDN 4.0
,
!268
Resolve "(OPT) Integrate QKD tests in TFS CI/CD pipeline"
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/device/.gitlab-ci.yml
+27
-0
27 additions, 0 deletions
src/device/.gitlab-ci.yml
src/service/service/service_handlers/qkd/qkd_service_handler.py
+1
-1
1 addition, 1 deletion
...rvice/service/service_handlers/qkd/qkd_service_handler.py
with
28 additions
and
1 deletion
src/device/.gitlab-ci.yml
+
27
−
0
View file @
3fcbe991
...
@@ -38,6 +38,30 @@ build device:
...
@@ -38,6 +38,30 @@ build device:
-
manifests/${IMAGE_NAME}service.yaml
-
manifests/${IMAGE_NAME}service.yaml
-
.gitlab-ci.yml
-
.gitlab-ci.yml
# Start Mock QKD Nodes before unit testing
start_mock_nodes
:
stage
:
deploy
script
:
-
bash src/tests/tools/mock_qkd_nodes/start.sh &
-
sleep
10
# wait for nodes to spin up
artifacts
:
paths
:
-
mock_nodes.log
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"'
# Prepare Scenario (Start NBI, mock services)
prepare_scenario
:
stage
:
deploy
script
:
-
pytest src/tests/qkd/unit/PrepareScenario.py
needs
:
-
start_mock_nodes
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"'
# Apply unit test to the component
# Apply unit test to the component
unit_test device
:
unit_test device
:
variables
:
variables
:
...
@@ -46,6 +70,8 @@ unit_test device:
...
@@ -46,6 +70,8 @@ unit_test device:
stage
:
unit_test
stage
:
unit_test
needs
:
needs
:
-
build device
-
build device
-
start_mock_nodes
-
prepare_scenario
before_script
:
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
>
-
>
...
@@ -68,6 +94,7 @@ unit_test device:
...
@@ -68,6 +94,7 @@ unit_test device:
-
docker logs $IMAGE_NAME
-
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_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 $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 $IMAGE_NAME/tests/qkd/unit/test_*.py"
-
docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
-
docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"
coverage
:
'
/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
coverage
:
'
/TOTAL\s+\d+\s+\d+\s+(\d+%)/'
after_script
:
after_script
:
...
...
This diff is collapsed.
Click to expand it.
src/service/service/service_handlers/qkd/qkd_service_handler.py
+
1
−
1
View file @
3fcbe991
...
@@ -17,7 +17,7 @@ import json, logging, uuid
...
@@ -17,7 +17,7 @@ import json, logging, uuid
from
typing
import
Any
,
Dict
,
List
,
Optional
,
Tuple
,
Union
from
typing
import
Any
,
Dict
,
List
,
Optional
,
Tuple
,
Union
from
common.method_wrappers.Decorator
import
MetricsPool
,
metered_subclass_method
from
common.method_wrappers.Decorator
import
MetricsPool
,
metered_subclass_method
from
common.proto.context_pb2
import
ConfigRule
,
DeviceId
,
Service
from
common.proto.context_pb2
import
ConfigRule
,
DeviceId
,
Service
from
common.proto.app_pb2
import
App
,
QKDAppStatusEnum
,
QKDAppTypesEnum
from
common.proto.
qkd_
app_pb2
import
App
,
QKDAppStatusEnum
,
QKDAppTypesEnum
from
common.tools.object_factory.ConfigRule
import
json_config_rule_delete
,
json_config_rule_set
from
common.tools.object_factory.ConfigRule
import
json_config_rule_delete
,
json_config_rule_set
from
common.tools.object_factory.Device
import
json_device_id
from
common.tools.object_factory.Device
import
json_device_id
from
common.type_checkers.Checkers
import
chk_type
from
common.type_checkers.Checkers
import
chk_type
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment