Skip to content
Snippets Groups Projects
Commit 4ed25d6e authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

Merge branch 'ci-gnb-new-mounting-config-point' into 'master'

chore(ci): new RAN image format for entrypoint and mounting management

See merge request !120
parents 530c9c41 26413d45
No related branches found
No related tags found
1 merge request!120chore(ci): new RAN image format for entrypoint and mounting management
......@@ -226,6 +226,13 @@ pipeline {
sh "docker image inspect --format='Size = {{.Size}} bytes' ${ranFullImage} >> archives/oai-gnb-image-info.log"
sh "echo 'OC Pushed Tag is N/A' >> archives/oai-gnb-image-info.log"
stash allowEmpty: true, includes: 'archives/oai-gnb-image-info.log', name: 'gNB_image'
// Check for entrypoint content (until 2023.w22)
sh "docker create --name test-entrypoint ${ranFullImage}"
sh "docker cp test-entrypoint:/opt/oai-gnb/bin/entrypoint.sh gnb-entrypoint.sh"
sh "docker rm -f test-entrypoint"
entryContent = sh returnStdout: true, script: "cat gnb-entrypoint.sh"
mountedFileAsMountedDotConf = entryContent.contains('create sed expressions for substituting each occurrence')
sh "rm -f gnb-entrypoint.sh"
// Adding capture on SCTP and L2 port 9999
sh "sudo rm -f /tmp/oai-gnb-l2-trace.pcap /tmp/oai-gnb-l2-trace.logs"
sh 'nohup sudo tshark -i any -f "sctp or udp port 9999" -w /tmp/oai-gnb-l2-trace.pcap > /tmp/oai-gnb-l2-trace.logs 2>&1 &'
......@@ -233,6 +240,9 @@ pipeline {
// Deploying now
dir ('ci-scripts/docker-compose/gnb-ci-testbed') {
sh "sed -i -e 's@image: oaisoftwarealliance/oai-gnb:develop@image: ${ranFullImage}@' docker-compose.yml"
if (mountedFileAsMountedDotConf) {
sh "sed -i -e 's@/opt/oai-gnb/etc/gnb.conf@/opt/oai-gnb/etc/mounted.conf@' docker-compose.yml"
}
sh "docker-compose up -d"
deployedGNB = true
gNBStatus = checkStatusOnGNB()
......
......@@ -2,7 +2,7 @@
## ref: https://hub.docker.com/r/library/mysql/tags/
##
image: "docker.io/mysql"
imageTag: "8.0"
imageTag: "5.7"
strategy:
type: Recreate
......
......@@ -13,7 +13,7 @@ services:
USE_ADDITIONAL_OPTIONS: --sa --continuous-tx --log_config.global_log_options level,nocolor,time,line_num,function --opt.type wireshark
volumes:
- /dev/bus/usb/:/dev/bus/usb/
- ./gnb-n77.conf:/opt/oai-gnb/etc/mounted.conf
- ./gnb-n77.conf:/opt/oai-gnb/etc/gnb.conf
healthcheck:
# pgrep does NOT work
test: /bin/bash -c "ps aux | grep -v grep | grep -c softmodem"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment