Skip to content

O
OpenXG-RAN
Commit 313a63f5 authored by Dhanuja Elizabeth Thomas's avatar Dhanuja Elizabeth Thomas Committed by Robert Schmidt
Browse files
Options

Update 5gcn images for CI 

- in ci-scripts for l2-sim, rf-sim
- in epc.py for OTA tests
parent 61312ca6
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
ci-scripts/epc.py
View file @ 313a63f5
...@@ -253,7 +253,7 @@ class EPCManagement(): ...@@ -253,7 +253,7 @@ class EPCManagement():
logging.debug('Starting OAI CN5G') logging.debug('Starting OAI CN5G')
mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5) mySSH.command('if [ -d ' + self.SourceCodePath + '/scripts ]; then echo ' + self.Password + ' | sudo -S rm -Rf ' + self.SourceCodePath + '/scripts ; fi', '\$', 5)
mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5) mySSH.command('mkdir -p ' + self.SourceCodePath + '/scripts', '\$', 5)
mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5) mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60) mySSH.command('python3 ./core-network.py '+self.cfgDeploy, '\$', 60)
if re.search('start-mini-as-ue', self.cfgDeploy): if re.search('start-mini-as-ue', self.cfgDeploy):
dFile = 'docker-compose-mini-nrf-asue.yaml' dFile = 'docker-compose-mini-nrf-asue.yaml'
...@@ -537,7 +537,7 @@ class EPCManagement(): ...@@ -537,7 +537,7 @@ class EPCManagement():
mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5) mySSH.command('docker logs ' + c + ' > ' + self.SourceCodePath + '/logs/' + c + '.log', '\$', 5)
logging.debug('Terminating OAI CN5G') logging.debug('Terminating OAI CN5G')
mySSH.command('cd /opt/oai-cn5g-fed-v1.3/docker-compose', '\$', 5) mySSH.command('cd /opt/oai-cn5g-fed-v1.4/docker-compose', '\$', 5)
mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60) mySSH.command('python3 ./core-network.py '+self.cfgUnDeploy, '\$', 60)
mySSH.command('docker volume prune --force || true', '\$', 60) mySSH.command('docker volume prune --force || true', '\$', 60)
time.sleep(2) time.sleep(2)
......
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
View file @ 313a63f5
...@@ -2,7 +2,7 @@ version: '3.8' ...@@ -2,7 +2,7 @@ version: '3.8'
services: services:
oai-nrf: oai-nrf:
container_name: "l2sim-oai-nrf" container_name: "l2sim-oai-nrf"
image: oai-nrf:latest image: oai-nrf:august-dev
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -42,7 +42,7 @@ services: ...@@ -42,7 +42,7 @@ services:
ipv4_address: 192.168.71.131 ipv4_address: 192.168.71.131
oai-amf: oai-amf:
container_name: "l2sim-oai-amf" container_name: "l2sim-oai-amf"
image: oai-amf:latest image: oai-amf:august-dev
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -110,7 +110,7 @@ services: ...@@ -110,7 +110,7 @@ services:
ipv4_address: 192.168.71.132 ipv4_address: 192.168.71.132
oai-smf: oai-smf:
container_name: "l2sim-oai-smf" container_name: "l2sim-oai-smf"
image: oai-smf:latest image: oai-smf:august-dev
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -156,7 +156,7 @@ services: ...@@ -156,7 +156,7 @@ services:
ipv4_address: 192.168.71.133 ipv4_address: 192.168.71.133
oai-spgwu: oai-spgwu:
container_name: "l2sim-oai-spgwu" container_name: "l2sim-oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:august-dev
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
......
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
View file @ 313a63f5
...@@ -2,7 +2,7 @@ version: '3.8' ...@@ -2,7 +2,7 @@ version: '3.8'
services: services:
oai-nrf: oai-nrf:
container_name: "rfsim5g-oai-nrf" container_name: "rfsim5g-oai-nrf"
image: oai-nrf:latest image: oai-nrf:august-dev
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -42,7 +42,7 @@ services: ...@@ -42,7 +42,7 @@ services:
ipv4_address: 192.168.71.131 ipv4_address: 192.168.71.131
oai-amf: oai-amf:
container_name: "rfsim5g-oai-amf" container_name: "rfsim5g-oai-amf"
image: oai-amf:latest image: oai-amf:august-dev
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -110,7 +110,7 @@ services: ...@@ -110,7 +110,7 @@ services:
ipv4_address: 192.168.71.132 ipv4_address: 192.168.71.132
oai-smf: oai-smf:
container_name: "rfsim5g-oai-smf" container_name: "rfsim5g-oai-smf"
image: oai-smf:latest image: oai-smf:august-dev
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -156,7 +156,7 @@ services: ...@@ -156,7 +156,7 @@ services:
ipv4_address: 192.168.71.133 ipv4_address: 192.168.71.133
oai-spgwu: oai-spgwu:
container_name: "rfsim5g-oai-spgwu" container_name: "rfsim5g-oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:august-dev
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment