From 1b5379b4530009fc7f8de38e519643d3065bc1e5 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 21 Mar 2023 15:21:41 +0000
Subject: [PATCH] test(ci): doing full deregistration test on HTTP2 profile
---
ci-scripts/Jenkinsfile-GitLab-Load-Check | 22 ++++++++++---------
ci-scripts/checkLoadTestHtmlReport.py | 2 +-
.../docker-compose-basic-nonrf.yaml | 2 +-
docker-compose/docker-compose-basic-nrf.yaml | 2 +-
.../docker-compose-basic-vpp-nonrf.yaml | 2 +-
.../docker-compose-basic-vpp-nrf-http2.yaml | 2 +-
.../docker-compose-basic-vpp-nrf.yaml | 2 +-
.../docker-compose-basic-vpp-pcf-ulcl.yaml | 2 +-
docker-compose/docker-compose-mini-nonrf.yaml | 2 +-
docker-compose/docker-compose-mini-nrf.yaml | 2 +-
.../docker-compose-no-privilege.yaml | 2 +-
.../docker-compose-slicing-basic-nrf.yaml | 2 +-
12 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-GitLab-Load-Check b/ci-scripts/Jenkinsfile-GitLab-Load-Check
index b3c34999..ec38e99e 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Load-Check
+++ b/ci-scripts/Jenkinsfile-GitLab-Load-Check
@@ -388,7 +388,7 @@ pipeline {
}
}
}
- stage ('Deploy OAI-CN5G in Basic-NRF - PDU Sess Est Test - HTTP2') {
+ stage ('Deploy OAI-CN5G in Basic-NRF - Deregistration Test - HTTP2') {
steps {
script {
echo 'Silencing all NFs to reduce size of logs'
@@ -420,7 +420,7 @@ pipeline {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
}
sleep 5
- retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+ retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
dir ('docker-compose') {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
}
@@ -430,16 +430,18 @@ pipeline {
}
}
// PDU Session Establishment Test should not fail
- stage ('PDU Session Establishment Test - HTTP2') {
+ stage ('Deregistration Test - HTTP2') {
steps {
script {
dir ('ci-scripts/docker-compose/load-test-gnbsim') {
sh 'sed -i -e "s@TEST_REGISTER@False@" -e "s@NB_REGISTRATIONS@10@" omec-gnbsim-config-*.yaml'
- sh 'sed -i -e "s@TEST_PDU_SESSION@True@" -e "s@NB_PDU_SESSIONS@5@" omec-gnbsim-config-*.yaml'
+ sh 'sed -i -e "s@TEST_PDU_SESSION@True@" -e "s@NB_PDU_SESSIONS@125@" -e "s@pdusessest@deregister@" omec-gnbsim-config-*.yaml'
sh 'docker-compose -f docker-compose-omec-gnbsim.yaml up -d'
- sh '../../checkOmecGnbsimStatus.py --timeout 120'
+ // One UE takes 3.7 seconds to finish (3 seconds for the traffic test)
+ // 125 UE x 3.7 = 460 seconds (ie 8 minutes)
+ sh '../../checkOmecGnbsimStatus.py --timeout 500'
}
- retrieveGnbsimLogs('archives/pdu-sess-est-test-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
+ retrieveGnbsimLogs('archives/deregistration-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
dir ('ci-scripts/docker-compose/load-test-gnbsim') {
sh 'docker-compose -f docker-compose-omec-gnbsim.yaml down -t 0'
}
@@ -448,7 +450,7 @@ pipeline {
post {
unsuccessful {
script {
- retrieveGnbsimLogs('archives/pdu-sess-est-test-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
+ retrieveGnbsimLogs('archives/deregistration-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
dir ('ci-scripts/docker-compose/load-test-gnbsim') {
sh 'docker-compose -f docker-compose-omec-gnbsim.yaml down -t 0'
}
@@ -456,7 +458,7 @@ pipeline {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
}
sleep 5
- retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+ retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
dir ('docker-compose') {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
}
@@ -465,14 +467,14 @@ pipeline {
}
}
}
- stage ('Undeploy OAI-CN5G - PDU Sess Est Test - HTTP2') {
+ stage ('Undeploy OAI-CN5G - Deregistration Test - HTTP2') {
steps {
script {
dir ('docker-compose') {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
}
sleep 5
- retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+ retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
dir ('docker-compose') {
sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
}
diff --git a/ci-scripts/checkLoadTestHtmlReport.py b/ci-scripts/checkLoadTestHtmlReport.py
index cb639b14..c35efe3b 100755
--- a/ci-scripts/checkLoadTestHtmlReport.py
+++ b/ci-scripts/checkLoadTestHtmlReport.py
@@ -58,7 +58,7 @@ class HtmlReport():
wfile.write(generate_header(args))
loadTests = [('Registration', 'registration-test'), \
('PDU Session Establishment', 'pdu-sess-est-test'),
- ('PDU Session Establishment - HTTP2', 'pdu-sess-est-test-http2')]
+ ('Deregistration - HTTP2', 'deregistration-http2')]
for (testName, testPath) in loadTests:
wfile.write(self.testSummary(testName, testPath))
wfile.write(generate_footer())
diff --git a/docker-compose/docker-compose-basic-nonrf.yaml b/docker-compose/docker-compose-basic-nonrf.yaml
index c17cad2c..d33eeee6 100644
--- a/docker-compose/docker-compose-basic-nonrf.yaml
+++ b/docker-compose/docker-compose-basic-nonrf.yaml
@@ -75,7 +75,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-nrf.yaml b/docker-compose/docker-compose-basic-nrf.yaml
index 6f16ef24..5b12a86b 100644
--- a/docker-compose/docker-compose-basic-nrf.yaml
+++ b/docker-compose/docker-compose-basic-nrf.yaml
@@ -91,7 +91,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nonrf.yaml b/docker-compose/docker-compose-basic-vpp-nonrf.yaml
index 7073b6ad..0c9d6118 100644
--- a/docker-compose/docker-compose-basic-vpp-nonrf.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nonrf.yaml
@@ -75,7 +75,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
index d273abf3..8180cb0f 100644
--- a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
@@ -117,7 +117,7 @@ services:
- 8080/tcp
- 38412/sctp
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nrf.yaml b/docker-compose/docker-compose-basic-vpp-nrf.yaml
index 77c3d71e..499171ba 100644
--- a/docker-compose/docker-compose-basic-vpp-nrf.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nrf.yaml
@@ -91,7 +91,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
index 0c5fd195..b0ed2dea 100644
--- a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
+++ b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
@@ -117,7 +117,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- MCC=208
diff --git a/docker-compose/docker-compose-mini-nonrf.yaml b/docker-compose/docker-compose-mini-nonrf.yaml
index 66ea8b9a..bae1182f 100644
--- a/docker-compose/docker-compose-mini-nonrf.yaml
+++ b/docker-compose/docker-compose-mini-nonrf.yaml
@@ -24,7 +24,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-mini-nrf.yaml b/docker-compose/docker-compose-mini-nrf.yaml
index 7f6cb11a..0e733ff3 100644
--- a/docker-compose/docker-compose-mini-nrf.yaml
+++ b/docker-compose/docker-compose-mini-nrf.yaml
@@ -33,7 +33,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml
index 55481df2..2071cf62 100644
--- a/docker-compose/docker-compose-no-privilege.yaml
+++ b/docker-compose/docker-compose-no-privilege.yaml
@@ -34,7 +34,7 @@ services:
container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- MCC=208
- MNC=95
- REGION_ID=128
diff --git a/docker-compose/docker-compose-slicing-basic-nrf.yaml b/docker-compose/docker-compose-slicing-basic-nrf.yaml
index ba47af29..fad247eb 100644
--- a/docker-compose/docker-compose-slicing-basic-nrf.yaml
+++ b/docker-compose/docker-compose-slicing-basic-nrf.yaml
@@ -138,7 +138,7 @@ services:
container_name: oai-amf
image: oaisoftwarealliance/oai-amf:develop
environment:
- - TZ=Europe/paris
+ - TZ=Europe/Paris
- INSTANCE=0
- PID_DIRECTORY=/var/run
- MCC=208
--
GitLab