From 70aff5204d55482704a7f52e1ca974c77f7088cb Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 10 Oct 2024 13:22:15 +0000
Subject: [PATCH] EuCNC24:
- Isolated test from rest of CI/CD jobs
---
.gitlab-ci.yml | 48 ++++++++++++++++----------------
src/tests/.gitlab-ci.yml | 6 ++--
src/tests/eucnc24/.gitlab-ci.yml | 40 +++++++++++++-------------
3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcde3bb15..02d30d347 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,36 +22,36 @@ stages:
# include the individual .gitlab-ci.yml of each micro-service and tests
include:
#- local: '/manifests/.gitlab-ci.yml'
- - local: '/src/monitoring/.gitlab-ci.yml'
- - local: '/src/nbi/.gitlab-ci.yml'
- - local: '/src/context/.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'
- - local: '/src/opticalattackdetector/.gitlab-ci.yml'
- - local: '/src/opticalattackmanager/.gitlab-ci.yml'
- - local: '/src/opticalcontroller/.gitlab-ci.yml'
- - local: '/src/ztp/.gitlab-ci.yml'
- - local: '/src/policy/.gitlab-ci.yml'
- - local: '/src/automation/.gitlab-ci.yml'
- - local: '/src/forecaster/.gitlab-ci.yml'
+ #- local: '/src/monitoring/.gitlab-ci.yml'
+ #- local: '/src/nbi/.gitlab-ci.yml'
+ #- local: '/src/context/.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'
+ #- local: '/src/opticalattackdetector/.gitlab-ci.yml'
+ #- local: '/src/opticalattackmanager/.gitlab-ci.yml'
+ #- local: '/src/opticalcontroller/.gitlab-ci.yml'
+ #- local: '/src/ztp/.gitlab-ci.yml'
+ #- local: '/src/policy/.gitlab-ci.yml'
+ #- local: '/src/automation/.gitlab-ci.yml'
+ #- local: '/src/forecaster/.gitlab-ci.yml'
#- local: '/src/webui/.gitlab-ci.yml'
#- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
#- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
#- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
- - local: '/src/slice/.gitlab-ci.yml'
+ #- local: '/src/slice/.gitlab-ci.yml'
#- local: '/src/interdomain/.gitlab-ci.yml'
- - local: '/src/pathcomp/.gitlab-ci.yml'
+ #- local: '/src/pathcomp/.gitlab-ci.yml'
#- local: '/src/dlt/.gitlab-ci.yml'
- - local: '/src/load_generator/.gitlab-ci.yml'
- - local: '/src/bgpls_speaker/.gitlab-ci.yml'
- - local: '/src/kpi_manager/.gitlab-ci.yml'
- - local: '/src/kpi_value_api/.gitlab-ci.yml'
- - local: '/src/kpi_value_writer/.gitlab-ci.yml'
- - local: '/src/telemetry/.gitlab-ci.yml'
- - local: '/src/analytics/.gitlab-ci.yml'
- - local: '/src/qos_profile/.gitlab-ci.yml'
+ #- local: '/src/load_generator/.gitlab-ci.yml'
+ #- local: '/src/bgpls_speaker/.gitlab-ci.yml'
+ #- local: '/src/kpi_manager/.gitlab-ci.yml'
+ #- local: '/src/kpi_value_api/.gitlab-ci.yml'
+ #- local: '/src/kpi_value_writer/.gitlab-ci.yml'
+ #- local: '/src/telemetry/.gitlab-ci.yml'
+ #- local: '/src/analytics/.gitlab-ci.yml'
+ #- local: '/src/qos_profile/.gitlab-ci.yml'
# This should be last one: end-to-end integration tests
- local: '/src/tests/.gitlab-ci.yml'
diff --git a/src/tests/.gitlab-ci.yml b/src/tests/.gitlab-ci.yml
index bafa17960..ed4bad5f6 100644
--- a/src/tests/.gitlab-ci.yml
+++ b/src/tests/.gitlab-ci.yml
@@ -15,9 +15,9 @@
# include the individual .gitlab-ci.yml of each end-to-end integration test
include:
- local: '/src/tests/eucnc24/.gitlab-ci.yml'
- - local: '/src/tests/ofc22/.gitlab-ci.yml'
+ #- local: '/src/tests/ofc22/.gitlab-ci.yml'
#- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'
- - local: '/src/tests/ecoc22/.gitlab-ci.yml'
+ #- local: '/src/tests/ecoc22/.gitlab-ci.yml'
#- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'
#- local: '/src/tests/ofc23/.gitlab-ci.yml'
- - local: '/src/tests/ofc24/.gitlab-ci.yml'
+ #- local: '/src/tests/ofc24/.gitlab-ci.yml'
diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 171853144..ca7ec6238 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -73,40 +73,40 @@ end2end_test eucnc24:
#- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
#- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/monitoringservice.yaml
- - source src/tests/${TEST_NAME}/deploy_specs.sh
+ #- source src/tests/${TEST_NAME}/deploy_specs.sh
#- export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"
#- export TFS_SKIP_BUILD="YES"
#- export TFS_IMAGE_TAG="latest"
#- echo "TFS_REGISTRY_IMAGES=${CI_REGISTRY_IMAGE}"
# Deploy TeraFlowSDN
- - ./deploy/crdb.sh
- - ./deploy/nats.sh
- - ./deploy/qdb.sh
+ #- ./deploy/crdb.sh
+ #- ./deploy/nats.sh
+ #- ./deploy/qdb.sh
#- ./deploy/kafka.sh
- - ./deploy/tfs.sh
- - ./deploy/show.sh
+ #- ./deploy/tfs.sh
+ #- ./deploy/show.sh
# Wait for Context to be subscribed to NATS
- - while ! kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server 2>&1 | grep -q 'Subscriber is Ready? True'; do sleep 1; done
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
+ #- while ! kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server 2>&1 | grep -q 'Subscriber is Ready? True'; do sleep 1; done
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
# Run end-to-end tests
- - >
- docker run -t --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
+ #- >
+ # docker run -t --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
after_script:
# Dump TeraFlowSDN component logs
- - source src/tests/${TEST_NAME}/deploy_specs.sh
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
- - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringservice -c server
+ #- source src/tests/${TEST_NAME}/deploy_specs.sh
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
+ #- kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/monitoringservice -c server
# Dump test container logs
- if docker ps -a | grep ${TEST_NAME}; then docker logs ${TEST_NAME}; fi
--
GitLab