diff --git a/ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf b/ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf similarity index 100% rename from ci-scripts/conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf rename to ci-scripts/conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf diff --git a/ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.100prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.100prb.usrpb200.tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf b/ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.rfsim-nos1.conf rename to ci-scripts/conf_files/enb.band7.25prb.rfsim.nos1.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf rename to ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf diff --git a/ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.25prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.25prb.usrpb200.tm1.conf diff --git a/ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf b/ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf similarity index 100% rename from ci-scripts/conf_files/enb.band7.50prb.usrpb200-tm1.conf rename to ci-scripts/conf_files/enb.band7.50prb.usrpb200.tm1.conf diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml index 4361409488..bb0bb9f982 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz_noS1/docker-compose.yml @@ -13,7 +13,7 @@ services: RFSIMULATOR: enb USE_ADDITIONAL_OPTIONS: --rfsim --log_config.global_log_options level,nocolor,time --noS1 volumes: - - ../../conf_files/enb.band7.25prb.rfsim-nos1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.rfsim.nos1.conf:/opt/oai-enb/etc/enb.conf healthcheck: test: /bin/bash -c "pgrep lte-softmodem" interval: 10s diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml index 8307ec4f34..27258e72ee 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml index b306920833..52a5302a39 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_05Mhz_tm1_no_rrc_activity/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.25prb.usrpb200-tm1-norrc.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.25prb.usrpb200.tm1-norrc.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml index 7e2bdfbe8b..d8fa5d4fd0 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.50prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml index c707d6bda1..69f47b2bf0 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_10Mhz_tm1_cdrx/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 120 --eNBs.[0].component_carriers.[0].drx_Config_present prSetup --eNBs.[0].component_carriers.[0].drx_onDurationTimer psf1 --eNBs.[0].component_carriers.[0].drx_InactivityTimer psf1 --eNBs.[0].component_carriers.[0].drx_RetransmissionTimer psf1 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset_present prSf128 --eNBs.[0].component_carriers.[0].drx_longDrx_CycleStartOffset 0 --eNBs.[0].component_carriers.[0].drx_shortDrx_Cycle sf16 --eNBs.[0].component_carriers.[0].drx_shortDrx_ShortCycleTimer 3 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.50prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.50prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml index 58dc034d1e..041cce37aa 100644 --- a/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_fdd_20Mhz_tm1/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band7.100prb.usrpb200-tm1.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band7.100prb.usrpb200.tm1.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: diff --git a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml index 138f2088d9..da2f109cd7 100644 --- a/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml +++ b/ci-scripts/yaml_files/lte_b200_tdd_20Mhz_tm1_default_scheduler/docker-compose.yml @@ -9,7 +9,7 @@ services: USE_B2XX: 'yes' USE_ADDITIONAL_OPTIONS: --RUs.[0].max_rxgain 115 --eNBs.[0].component_carriers.[0].pdsch_referenceSignalPower -29 --MACRLCs.[0].scheduler_mode default --log_config.global_log_options level,nocolor,time,line_num,function volumes: - - ../../conf_files/enb.band40.100prb.usrpb200-tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf + - ../../conf_files/enb.band40.100prb.usrpb200.tm1-defaultscheduler.conf:/opt/oai-enb/etc/enb.conf - /dev:/dev network_mode: "host" healthcheck: