diff --git a/src/integration_tester/.gitlab-ci.yml b/src/integration_tester/.gitlab-ci.yml index 4d3b690741ed3c0564cb8453373aee83a55ae79e..dfb89a8bba453f243448628b4f3f0eeac2e08162 100644 --- a/src/integration_tester/.gitlab-ci.yml +++ b/src/integration_tester/.gitlab-ci.yml @@ -55,6 +55,8 @@ integration_test integration_tester: script: - kubectl version - kubectl get all + - kubectl --namespace=gitlab-ci delete pod integration-tester --wait=true --ignore-not-found=false + - kubectl get all # --rm to remove tester when it finishes - kubectl run $(echo $IMAGE_NAME | sed -r 's/[^a-zA-Z0-9\.\-]/-/g') --image "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG" --restart=Never -i --tty - kubectl get all diff --git a/src/integration_tester/test_context_device.py b/src/integration_tester/test_context_device.py index a0eaa1fff4bcb7139c474aec6e97ea63aa377626..bef7f02c7519212eb47f658da77603dc85b18372 100644 --- a/src/integration_tester/test_context_device.py +++ b/src/integration_tester/test_context_device.py @@ -1,9 +1,9 @@ import logging, os, pytest from google.protobuf.json_format import MessageToDict -from src.common.tests.Assertions import validate_device_id, validate_link_id, validate_topology_has_devices, \ - validate_topology_has_links, validate_topology_is_empty from common.database.Factory import get_database, DatabaseEngineEnum from common.database.api.Database import Database +from common.tests.Assertions import validate_device_id, validate_link_id, validate_topology_has_devices, \ + validate_topology_has_links, validate_topology_is_empty from context.client.ContextClient import ContextClient from context.proto.context_pb2 import Device, Empty, Link from device.client.DeviceClient import DeviceClient