From ecfcb7e43e01bd0382b23a06df247e80579ceb05 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 17 Oct 2024 17:03:37 +0000
Subject: [PATCH] EuCNC24: Fixed CI/CD pipeline
---
.gitlab-ci.yml | 4 +--
src/tests/eucnc24/.gitlab-ci.yml | 27 +++++--------------
.../eucnc24/tests/test_service_ietf_remove.py | 1 -
3 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fab393946..329f321f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,9 +23,9 @@ stages:
include:
#- local: '/manifests/.gitlab-ci.yml'
#- local: '/src/monitoring/.gitlab-ci.yml'
- - local: '/src/nbi/.gitlab-ci.yml'
+ #- local: '/src/nbi/.gitlab-ci.yml'
#- local: '/src/context/.gitlab-ci.yml'
- - local: '/src/device/.gitlab-ci.yml'
+ #- local: '/src/device/.gitlab-ci.yml'
#- local: '/src/service/.gitlab-ci.yml'
#- local: '/src/dbscanserving/.gitlab-ci.yml'
#- local: '/src/opticalattackmitigator/.gitlab-ci.yml'
diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 2c2f89f53..0fb273e5d 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -114,21 +114,17 @@ end2end_test eucnc24:
# Run end-to-end test: onboard scenario
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-onboarding.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
# Run end-to-end test: configure service TFS
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-tfs-create.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
# Run end-to-end test: test connectivity with ping
- sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -139,21 +135,17 @@ end2end_test eucnc24:
# Run end-to-end test: deconfigure service TFS
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-tfs-remove.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
# Run end-to-end test: configure service IETF
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-ietf-create.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
# Run end-to-end test: test connectivity with ping
- sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -164,21 +156,17 @@ end2end_test eucnc24:
# Run end-to-end test: deconfigure service IETF
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-service-ietf-remove.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
# Run end-to-end test: cleanup scenario
- >
- docker run -t --name ${TEST_NAME} --network=host
+ docker run -t --rm --name ${TEST_NAME} --network=host
--volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
--volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
$CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-cleanup.sh
- - docker logs ${TEST_NAME} || true
- - docker rm -f ${TEST_NAME} || true
after_script:
# Dump TeraFlowSDN component logs
@@ -190,9 +178,6 @@ end2end_test eucnc24:
- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
#- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringservice -c server
- # Dump test container logs
- - docker logs ${TEST_NAME} || true
-
# Destroy Scenario
- docker rm -f ${TEST_NAME} || true
- RUNNER_PATH=`pwd`
diff --git a/src/tests/eucnc24/tests/test_service_ietf_remove.py b/src/tests/eucnc24/tests/test_service_ietf_remove.py
index 8b87474ca..f64fc07bf 100644
--- a/src/tests/eucnc24/tests/test_service_ietf_remove.py
+++ b/src/tests/eucnc24/tests/test_service_ietf_remove.py
@@ -52,7 +52,6 @@ def test_service_ietf_removal(
service_uuids : Set[str] = set()
for service in response.services:
service_id = service.service_id
- assert service_id.service_uuid.uuid == service_uuid
assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE
assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM
--
GitLab