From d737e82d9521522e3d825d66217f5caeebcf6f4d Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 23 Sep 2020 11:47:35 +0200
Subject: [PATCH] CI: adding the dsTester script call
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-GitLab-Docker | 7 ++++---
ci-scripts/temp/generate_smf_conf.sh | 3 +++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index 257c39bc..9eff3b8d 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -96,8 +96,7 @@ pipeline {
echo "Node is ${NODE_NAME}"
}
if (params.DS_Tester_Server_Flag != null) {
- // Disabling locking of DsTester in development phase of pipeline
- //dsT_host_flag = params.DS_Tester_Server_Flag
+ dsT_host_flag = params.DS_Tester_Server_Flag
if (dsT_host_flag) {
def allParametersPresent = true
if (params.DS_Tester_Server_Name == null) {
@@ -212,7 +211,9 @@ pipeline {
steps {
lock (ds_tester_ci_resource) {
script {
- sh "sleep 10"
+ myShCmd('cd /home/oaici/CI-dev-ops-cn5g && git clean -x -d -f > /dev/null', new_host_flag, new_host_user, new_host)
+ myShCmdWithLog('cd /home/oaici/CI-dev-ops-cn5g/scripts && CI_ENV=True SRC_BASE_DIR=/tmp/CI-CN5G-FED ./run-5gc.bash -pt --shark --detach --get-results --5g', 'archives/run-5g-dstester.log', new_host_flag, new_host_user, new_host)
+ copyFrom2ndServer('DS-TEST-RESULTS/*.tar', 'DS-TEST-RESULTS', new_host_flag, new_host_user, new_host)
}
}
}
diff --git a/ci-scripts/temp/generate_smf_conf.sh b/ci-scripts/temp/generate_smf_conf.sh
index 140d7f1b..0c3fb7e5 100755
--- a/ci-scripts/temp/generate_smf_conf.sh
+++ b/ci-scripts/temp/generate_smf_conf.sh
@@ -14,12 +14,15 @@ SMF_CONF[@SMF_INTERFACE_NAME_FOR_SBI@]='CI_SBI_IF_NAME'
SMF_CONF[@SMF_INTERFACE_PORT_FOR_SBI@]='80'
SMF_CONF[@SMF_INTERFACE_HTTP2_PORT_FOR_SBI@]='9090'
+SMF_CONF[@SMF_API_VERSION@]='v1'
SMF_CONF[@UDM_IPV4_ADDRESS@]='127.0.0.1'
SMF_CONF[@UDM_PORT@]='80'
+SMF_CONF[@UDM_API_VERSION@]='v2'
SMF_CONF[@AMF_IPV4_ADDRESS@]='CI_AMF_IP_ADDR'
SMF_CONF[@AMF_PORT@]='80'
+SMF_CONF[@AMF_API_VERSION@]='v1'
SMF_CONF[@UPF_IPV4_ADDRESS@]='CI_UPF_IP_ADDR'
--
GitLab