From 1161f9a69189d07bde742af1549a04f74c07135a Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 18 Mar 2024 16:19:43 +0000
Subject: [PATCH] CI/CD pipeline - OFC'22 & ECOC'22:
- Fixed drop CRDB database commands
- Added DEBUG log dumps in relevant components
---
deploy/crdb.sh | 4 ++--
manifests/contextservice.yaml | 2 +-
manifests/deviceservice.yaml | 2 +-
manifests/monitoringservice.yaml | 2 +-
src/tests/ecoc22/.gitlab-ci.yml | 4 ++++
src/tests/ofc22/.gitlab-ci.yml | 4 ++++
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/deploy/crdb.sh b/deploy/crdb.sh
index b2ff1b03b..a304e83d1 100755
--- a/deploy/crdb.sh
+++ b/deploy/crdb.sh
@@ -170,7 +170,7 @@ function crdb_drop_database_single() {
CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"
echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"
- kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
+ kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-0 -- \
./cockroach sql --certs-dir=/cockroach/cockroach-certs --url=${CRDB_CLIENT_URL} \
--execute "DROP DATABASE IF EXISTS ${CRDB_DATABASE};"
echo
@@ -353,7 +353,7 @@ function crdb_undeploy_cluster() {
function crdb_drop_database_cluster() {
echo "Drop database if exists"
- kubectl exec -it --namespace ${CRDB_NAMESPACE} cockroachdb-client-secure -- \
+ kubectl exec -i --namespace ${CRDB_NAMESPACE} cockroachdb-client-secure -- \
./cockroach sql --certs-dir=/cockroach/cockroach-certs --host=cockroachdb-public --execute \
"DROP DATABASE IF EXISTS ${CRDB_DATABASE};"
echo
diff --git a/manifests/contextservice.yaml b/manifests/contextservice.yaml
index df06c86b5..5d0e6102c 100644
--- a/manifests/contextservice.yaml
+++ b/manifests/contextservice.yaml
@@ -40,7 +40,7 @@ spec:
- name: MB_BACKEND
value: "nats"
- name: LOG_LEVEL
- value: "INFO"
+ value: "DEBUG"
- name: ALLOW_EXPLICIT_ADD_DEVICE_TO_TOPOLOGY
value: "FALSE"
- name: ALLOW_EXPLICIT_ADD_LINK_TO_TOPOLOGY
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 77e421f29..7f7885daf 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -39,7 +39,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "INFO"
+ value: "DEBUG"
startupProbe:
exec:
command: ["/bin/grpc_health_probe", "-addr=:2020"]
diff --git a/manifests/monitoringservice.yaml b/manifests/monitoringservice.yaml
index dbcfa68a0..1a2059395 100644
--- a/manifests/monitoringservice.yaml
+++ b/manifests/monitoringservice.yaml
@@ -36,7 +36,7 @@ spec:
- containerPort: 9192
env:
- name: LOG_LEVEL
- value: "INFO"
+ value: "DEBUG"
envFrom:
- secretRef:
name: qdb-data
diff --git a/src/tests/ecoc22/.gitlab-ci.yml b/src/tests/ecoc22/.gitlab-ci.yml
index 94df23f88..fb54c2d5c 100644
--- a/src/tests/ecoc22/.gitlab-ci.yml
+++ b/src/tests/ecoc22/.gitlab-ci.yml
@@ -84,6 +84,10 @@ end2end_test ecoc22:
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_create_service.py --junitxml=./src/tests/${TEST_NAME}/report_create_service.xml
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_delete_service.py --junitxml=./src/tests/${TEST_NAME}/report_delete_service.xml
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_cleanup.py --junitxml=./src/tests/${TEST_NAME}/report_cleanup.xml
+ - 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/monitoringservice -c server
+ - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/ztpservice -c server
after_script:
- if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
- docker images --filter="dangling=true" --quiet | xargs -r docker rmi
diff --git a/src/tests/ofc22/.gitlab-ci.yml b/src/tests/ofc22/.gitlab-ci.yml
index 65c58d112..d7123a952 100644
--- a/src/tests/ofc22/.gitlab-ci.yml
+++ b/src/tests/ofc22/.gitlab-ci.yml
@@ -84,6 +84,10 @@ end2end_test ofc22:
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_create_service.py --junitxml=./src/tests/${TEST_NAME}/report_create_service.xml
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_delete_service.py --junitxml=./src/tests/${TEST_NAME}/report_delete_service.xml
#- pytest --verbose --log-level=INFO ./src/tests/${TEST_NAME}/tests/test_functional_cleanup.py --junitxml=./src/tests/${TEST_NAME}/report_cleanup.xml
+ - 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/monitoringservice -c server
+ - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/ztpservice -c server
after_script:
- if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
- docker images --filter="dangling=true" --quiet | xargs -r docker rmi
--
GitLab