From d2c9b727e7156b5d277a4088e7a4c6357a9f5c61 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 22 Dec 2023 12:06:29 +0000
Subject: [PATCH] NBI Component:
- Fixing GitLab CI/CD pipeline
- Updated scripts to manually launch NBI tests
---
scripts/run_tests_locally-nbi-all.sh | 26 +++++++++++++++++++++
scripts/run_tests_locally-nbi-ietf-l2vpn.sh | 1 +
src/nbi/.gitlab-ci.yml | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100755 scripts/run_tests_locally-nbi-all.sh
diff --git a/scripts/run_tests_locally-nbi-all.sh b/scripts/run_tests_locally-nbi-all.sh
new file mode 100755
index 000000000..39930a677
--- /dev/null
+++ b/scripts/run_tests_locally-nbi-all.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+PROJECTDIR=`pwd`
+
+cd $PROJECTDIR/src
+RCFILE=$PROJECTDIR/coverage/.coveragerc
+
+# Run unitary tests and analyze coverage of code at same time
+# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0
+coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
+ nbi/tests/test_ietf_l2vpn.py \
+ nbi/tests/test_ietf_network.py
diff --git a/scripts/run_tests_locally-nbi-ietf-l2vpn.sh b/scripts/run_tests_locally-nbi-ietf-l2vpn.sh
index f6b53e432..595606d1f 100755
--- a/scripts/run_tests_locally-nbi-ietf-l2vpn.sh
+++ b/scripts/run_tests_locally-nbi-ietf-l2vpn.sh
@@ -20,5 +20,6 @@ cd $PROJECTDIR/src
RCFILE=$PROJECTDIR/coverage/.coveragerc
# Run unitary tests and analyze coverage of code at same time
+# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0
coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
nbi/tests/test_ietf_l2vpn.py
diff --git a/src/nbi/.gitlab-ci.yml b/src/nbi/.gitlab-ci.yml
index 8711cfb72..1cb086a6b 100644
--- a/src/nbi/.gitlab-ci.yml
+++ b/src/nbi/.gitlab-ci.yml
@@ -67,7 +67,7 @@ unit_test nbi:
- docker ps -a
- docker logs $IMAGE_NAME
- >
- docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose
+ docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO -o log_cli=true --verbose
$IMAGE_NAME/tests/test_ietf_l2vpn.py
$IMAGE_NAME/tests/test_ietf_network.py
--junitxml=/opt/results/${IMAGE_NAME}_report.xml"
--
GitLab