From c120f07a02f409c8098dbe8f8367349d9774e2e9 Mon Sep 17 00:00:00 2001
From: Mohammed Ismail <mohammed.ismail@openairinterface.org>
Date: Tue, 16 Mar 2021 10:49:55 +0100
Subject: [PATCH] reviewed and updated based on the MR comments
Signed-off-by: Mohammed Ismail <mohammed.ismail@openairinterface.org>
---
ci-scripts/Jenkinsfile-GitLab-Docker | 24 +++++++++----------
.../dsTesterDockerCompose/docker-compose.tplt | 16 ++++++++++++-
2 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index 2107b22f..46310d9c 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -60,14 +60,14 @@ def scmEvent = false
def upstreamEvent = false
// Default tags / branches --> could be passed on by upstream job or by PR content
-def nrfTag = 'develop'
-def nrfBranch = 'develop'
-def amfTag = 'develop'
-def amfBranch = 'develop'
-def smfTag = 'develop'
-def smfBranch = 'develop'
-def spgwuTag = 'nrf-com'
-def spgwuBranch = 'master'
+def nrfTag = params.nrfTag
+def nrfBranch = params.nrfBranch
+def amfTag = params.amfTag
+def amfBranch = params.amfBranch
+def smfTag = params.smfTag
+def smfBranch = params.smfBranch
+def spgwuTag = params.spgwuTag
+def spgwuBranch = params.spgwuBranch
//-------------------------------------------------------------------------------
// Pipeline start
@@ -226,9 +226,9 @@ pipeline {
error "OAI SMF Image tag to test does not exist!"
}
try {
- 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'
+ 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'
} catch (Exception e) {
error "OAI SPGW-U-Tiny Image tag to test does not exist!"
}
@@ -241,7 +241,7 @@ pipeline {
echo '\u2705 \u001B[32mDeploy CN5G in idle mode\u001B[0m'
// Prepare all needed files for docker-compose
// First put all correct tags to test
- sh 'sed -e "s#NRF_IMAGE_TAG#' + nrfTag + '#" -e "s#AMF_IMAGE_TAG#' + amfTag + '#" -e "s#SMF_IMAGE_TAG#' + smfTag + '#" ci-scripts/dsTesterDockerCompose/docker-compose.tplt > ci-scripts/dsTesterDockerCompose/docker-compose.yml'
+ sh 'sed -e "s#NRF_IMAGE_TAG#' + nrfTag + '#" -e "s#AMF_IMAGE_TAG#' + amfTag + '#" -e "s#SMF_IMAGE_TAG#' + smfTag + '#" -e "s#SPGWU_IMAGE_TAG#' + spgwuTag + '#" ci-scripts/dsTesterDockerCompose/docker-compose.tplt > ci-scripts/dsTesterDockerCompose/docker-compose.yml'
// Entrypoints are modified to be inactive for dsTester framework
sh 'sed -e "s@exec.*@sleep infinity@" component/oai-nrf/scripts/entrypoint.sh > ci-scripts/dsTesterDockerCompose/nrf-entrypoint-sleep.sh'
sh 'sed -e "s@exec.*@sleep infinity@" component/oai-amf/scripts/entrypoint.sh > ci-scripts/dsTesterDockerCompose/amf-entrypoint-sleep.sh'
diff --git a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
index 4c7f10b1..b675cef6 100644
--- a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
+++ b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
@@ -164,7 +164,7 @@ services:
cicd_oai_upf:
container_name: cicd-oai-upf
- image: oai-spgwu:nrf-com
+ image: oai-spgwu-tiny:SPGWU_IMAGE_TAG
ports:
- 2152
- 8805
@@ -174,8 +174,22 @@ services:
- 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
--
GitLab