diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index 843fd9aab4470c4d234185cf0fdcf2782005e6b4..625b8e656adaebfb552ddb37e6bf54140c483a14 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -60,13 +60,13 @@ def scmEvent = false
def upstreamEvent = false
// Default tags / branches --> could be passed on by upstream job or by PR content
-def nrfTag = 'develop'
+def nrfTag = 'dockerfile'
def nrfBranch = 'dockerfile'
-def amfTag = 'develop'
+def amfTag = 'nrf-com'
def amfBranch = 'develop'
-def smfTag = 'develop'
+def smfTag = 'dockerfile'
def smfBranch = 'develop'
-def spgwuTag = 'v1.1.0'
+def spgwuTag = 'nrf-com'
def spgwuBranch = 'master'
//-------------------------------------------------------------------------------
@@ -226,9 +226,9 @@ pipeline {
error "OAI SMF Image tag to test does not exist!"
}
try {
- sh 'echo "OAI_SPGWU_TAG: oai-spgwu-tiny:' + spgwuTag +'" > archives/oai_spgwu_image_info.log'
- sh 'docker image inspect --format=\'Size = {{.Size}} bytes\' oai-spgwu-tiny:' + spgwuTag + ' >> archives/oai_spgwu_image_info.log'
- sh 'docker image inspect --format=\'Date = {{.Created}}\' oai-spgwu-tiny:' + spgwuTag + ' >> archives/oai_spgwu_image_info.log'
+ sh 'echo "OAI_SPGWU_TAG: oai-spgwu:' + spgwuTag +'" > archives/oai_spgwu_image_info.log'
+ sh 'docker image inspect --format=\'Size = {{.Size}} bytes\' oai-spgwu:' + spgwuTag + ' >> archives/oai_spgwu_image_info.log'
+ sh 'docker image inspect --format=\'Date = {{.Created}}\' oai-spgwu:' + spgwuTag + ' >> archives/oai_spgwu_image_info.log'
} catch (Exception e) {
error "OAI SPGW-U-Tiny Image tag to test does not exist!"
}
@@ -266,7 +266,7 @@ pipeline {
script {
// Check status on mysql.
try {
- sh 'docker exec -it cicd-mysql-svr /bin/bash -c "mysqladmin -u root --password=linux ping" > archives/mysql_status.log 2>&1'
+ sh 'docker exec cicd-mysql-svr /bin/bash -c "mysqladmin -u root --password=linux ping" > archives/mysql_status.log 2>&1'
sh 'docker inspect --format=\'STATUS: {{.State.Health.Status}}\' cicd-mysql-svr >> archives/mysql_status.log'
} catch (Exception e) {
sh 'echo "STATUS: KO" >> archives/mysql_status.log'
diff --git a/ci-scripts/dsTestGenerateHTMLReport.py b/ci-scripts/dsTestGenerateHTMLReport.py
index de9008872d474b9470bd6a0cf5a5075bb17259f6..7b0defb8968f64205b6f092406f5fd189c3bf613 100644
--- a/ci-scripts/dsTestGenerateHTMLReport.py
+++ b/ci-scripts/dsTestGenerateHTMLReport.py
@@ -44,10 +44,11 @@ class HtmlReport():
self.generateFooter()
self.file.close()
- if finalStatus:
- sys.exit(0)
- else:
- sys.exit(-1)
+ try:
+ if finalStatus:
+ sys.exit(0)
+ except:
+ print("DS-TESTER testing FAILED")
def generateHeader(self):
# HTML Header
diff --git a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
index f00ab826c8ae096f55af41fdc1edc3ac21cd9523..de3eceec515e536f5bb7f9dad5776cc6966e3929 100644
--- a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
+++ b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
@@ -9,6 +9,7 @@ services:
volumes:
- ../../docker-compose/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql:rw
environment:
+ - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db
- MYSQL_USER=test
- MYSQL_PASSWORD=test
@@ -29,6 +30,7 @@ services:
- 80
- 9090
environment:
+ - TZ=Europe/Paris
- NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80
- NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
@@ -81,9 +83,11 @@ services:
- SMF_INSTANCE_ID_0=1
- SMF_IPV4_ADDR_0=192.168.61.197
- SMF_HTTP_VERSION_0=v1
+ - SELECTED_0=true
- SMF_INSTANCE_ID_1=2
- SMF_IPV4_ADDR_1=192.168.61.197
- SMF_HTTP_VERSION_1=v1
+ - SELECTED_1=false
- MYSQL_SERVER=cicd-mysql-svr
- MYSQL_USER=root
- MYSQL_PASS=linux
@@ -91,6 +95,8 @@ services:
- OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
- NRF_IPV4_ADDRESS=192.168.61.195
- NRF_PORT=80
+ - NF_REGISTRATION=yes
+ - SMF_SELECTION=yes
- NRF_API_VERSION=v1
- AUSF_IPV4_ADDRESS=192.168.61.210
- AUSF_PORT=80
@@ -116,7 +122,9 @@ services:
image: oai-smf:SMF_IMAGE_TAG
ports:
- 80
+ - 9090
environment:
+ - TZ=Europe/Paris
- INSTANCE=1
- PID_DIRECTORY=/var/run
- SMF_INTERFACE_NAME_FOR_N4=eth0
@@ -136,6 +144,8 @@ services:
- NRF_IPV4_ADDRESS=192.168.61.195
- NRF_PORT=80
- NRF_API_VERSION=v1
+ - REGISTER_NRF=yes
+ - DISCOVER_UPF=yes
depends_on:
- cicd_oai_nrf
- cicd_oai_amf
@@ -154,32 +164,24 @@ services:
cicd_oai_upf:
container_name: cicd-oai-upf
- image: oai-spgwu-tiny:v1.1.0
+ image: oai-spgwu:develop
ports:
- 2152
- 8805
environment:
+ - TZ=Europe/Paris
- PID_DIRECTORY=/var/run
- SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
- SGW_INTERFACE_NAME_FOR_SX=eth0
- PGW_INTERFACE_NAME_FOR_SGI=eth0
- - NETWORK_UE_NAT_OPTION=yes
- NETWORK_UE_IP=12.0.0.0/24
- - THREAD_S1U_PRIO=9090
- - S1U_THREADS=16
- - THREAD_SX_PRIO=64
- - SX_THREADS=1
- - THREAD_SGI_PRIO=64
- - SGI_THREADS=16
- SPGWC0_IP_ADDRESS=192.168.61.197
- - BYPASS_UL_PFCP_RULES=no
- - MCC=208
- - MNC=95
- - MNC03=095
- - TAC=40960
- - GW_ID=1
- - REALM=openairinterface.org
+ - NRF_IPV4_ADDRESS=192.168.61.195
+ - NRF_PORT=80
+ - NRF_API_VERSION=v1
+ - REGISTER_NRF=yes
depends_on:
+ - cicd_oai_nrf
- cicd_oai_smf
cap_add:
- NET_ADMIN