Commit 61c769f8 authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova
Browse files

Merge branch 'integration_2025_w30' into 'develop' 

Integration: `2025.w30`

* !3529 Add CI RFsim5G test for second PDU session
* !3532 Count bits in variable with mask
* !3533 CI: test T2 with DPDK 22.11
* !3535 RAN-Container-Parent: Auto-generate artifact in failure case
* !3542 bugfix: avoid segmentation fault when Redcap tries to connect to gNB
* !3543 rfsimulator: fix model name for channel
* !3540 CI: migrate RFSim4G to acamas machine

See merge request oai/openairinterface5g!3539
parents fc1c762c 300060c2

ci-scripts/Jenkinsfile-GitLab-Container

+6 −4
Original line number Diff line number Diff line
@@ -835,12 +835,14 @@ def finalizeSlaveJob(jobName) { 
        selector: lastCompleted())

      if (fileExists(fileName)) {

        sh "sed -i -e 's#TEMPLATE_BUILD_TIME#${JOB_TIMESTAMP}#' ${fileName}"

      } else {

        sh "echo \"could not copy results from ${jobName}, please check pipeline ${BUILD_URL}\" > ${fileName}"

      }

      archiveArtifacts artifacts: fileName

      // BUILD_URL is like  http://server:port/jenkins/job/foo/15/

      // no need to add a prefixed '/'

      artifactUrl += 'artifact/' + fileName

    }

    }

    artifactUrl = "\n * [${jobName}](${artifactUrl})"

    return artifactUrl

  }

ci-scripts/ci_infra.yaml

+9 −0
Original line number Diff line number Diff line
@@ -301,6 +301,15 @@ rfsim5g_ue: 
  AttachScript: docker start rfsim5g-oai-nr-ue

  DetachScript: docker stop rfsim5g-oai-nr-ue

  MTU: 1500

# for tests with second PDU session ID 2, needs to match requested PDU session name

rfsim5g_ue_pdu_2:

  Host: "%%current_host%%"

  NetworkScript: docker exec rfsim5g-oai-nr-ue ip a show dev oaitun_ue1p2

  CmdPrefix: docker exec rfsim5g-oai-nr-ue

  IF: oaitun_ue1p2

  AttachScript: docker start rfsim5g-oai-nr-ue

  DetachScript: docker stop rfsim5g-oai-nr-ue

  MTU: 1500



rfsim5g_ue2:

  Host: "%%current_host%%"

ci-scripts/cls_native.py

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import cls_analysis 
import constants as CONST



LOG_PATH_PHYSIM = 'phy_sim_logs'

DPDK_PATH = '/opt/dpdk-t2-22.11.0'



class Native():
@@ -39,7 +40,7 @@ class Native(): 


		with cls_cmd.getConnection(host) as ssh:

			base = f"{directory}/cmake_targets"

			ret = ssh.run(f"{base}/build_oai {options} > {base}/log/build_oai.log", timeout=900)

			ret = ssh.run(f"C_INCLUDE_PATH={DPDK_PATH}/include/ PKG_CONFIG_PATH={DPDK_PATH}/lib64/pkgconfig/ {base}/build_oai {options} > {base}/log/build_oai.log", timeout=900)

			success = ret.returncode == 0

			logs = ssh.run(f"cat {base}/log/build_oai.log", silent=True)

			logging.debug(f"build finished with code {ret.returncode}, output:\n{logs.stdout}")
@@ -73,7 +74,7 @@ class Native(): 
		os.system(f'mkdir -p ./{LOG_PATH_PHYSIM}')

		runLogFile=f'physim_{HTML.testCase_id}.log'

		with cls_cmd.getConnection(host) as cmd:

			cmd.run(f'sudo {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')

			cmd.run(f'sudo LD_LIBRARY_PATH=.:{DPDK_PATH}/lib64/ {workSpacePath}/ran_build/build/{physim_test} {options} >> {workSpacePath}/{runLogFile}')

			cmd.copyin(src=f'{workSpacePath}/{runLogFile}', tgt=f'{LOG_PATH_PHYSIM}/{runLogFile}')

		success, msg = cls_analysis.Analysis.analyze_physim(f'{LOG_PATH_PHYSIM}/{runLogFile}', physim_test, options, threshold)

		if success:

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz.xml

+9 −9
Original line number Diff line number Diff line
@@ -108,16 +108,16 @@ 
                <class>Attach_UE</class>

                <desc>Attach OAI UE (Wait for IP)</desc>

                <id>rfsim4g_ue</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

        </testCase>



        <testCase id="020011">

                <class>Ping</class>

                <desc>Ping Traffic-Gen from LTE-UE</desc>

                <id>rfsim4g_ue</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_ext_dn</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <ping_args>-c 20</ping_args>

                <ping_packetloss_threshold>5</ping_packetloss_threshold>

        </testCase>
@@ -126,9 +126,9 @@ 
                <class>Ping</class>

                <desc>Ping LTE-UE from Traffic-Gen</desc>

                <id>rfsim4g_ext_dn</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_ue</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <ping_args>-c 20</ping_args>

                <ping_packetloss_threshold>5</ping_packetloss_threshold>

        </testCase>
@@ -141,8 +141,8 @@ 
                <iperf_args>-u -t 30 -b 2M -R</iperf_args>

                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

                <nodes>cacofonix</nodes>

                <svr_node>cacofonix</svr_node>

                <nodes>acamas</nodes>

                <svr_node>acamas</svr_node>

        </testCase>



        <testCase id="030011">
@@ -153,8 +153,8 @@ 
                <iperf_args>-u -t 30 -b 1M</iperf_args>

                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>

                <nodes>cacofonix</nodes>

                <svr_node>cacofonix</svr_node>

                <nodes>acamas</nodes>

                <svr_node>acamas</svr_node>

        </testCase>



        <testCase id="100011">

ci-scripts/xml_files/container_4g_rfsim_fdd_05MHz_noS1.xml

+8 −8
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ 
                <class>Ping</class>

                <desc>Ping Traffic-Gen from LTE-UE</desc>

                <id>rfsim4g_ue</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_enb_nos1</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <ping_args>-c 20</ping_args>

                <ping_packetloss_threshold>5</ping_packetloss_threshold>

        </testCase>
@@ -97,9 +97,9 @@ 
                <class>Ping</class>

                <desc>Ping LTE-UE from eNB</desc>

                <id>rfsim4g_enb_nos1</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_ue</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <ping_args>-c 20</ping_args>

                <ping_packetloss_threshold>5</ping_packetloss_threshold>

        </testCase>
@@ -108,9 +108,9 @@ 
                <class>Iperf</class>

                <desc>Iperf UDP DL</desc>

                <id>rfsim4g_ue</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_enb_nos1</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <iperf_args>-u -t 30 -b 2M -R</iperf_args>

                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>
@@ -120,9 +120,9 @@ 
                <class>Iperf</class>

                <desc>Iperf UDP UL</desc>

                <id>rfsim4g_ue</id>

                <nodes>cacofonix</nodes>

                <nodes>acamas</nodes>

                <svr_id>rfsim4g_enb_nos1</svr_id>

                <svr_node>cacofonix</svr_node>

                <svr_node>acamas</svr_node>

                <iperf_args>-u -t 30 -b 1M</iperf_args>

                <iperf_packetloss_threshold>25</iperf_packetloss_threshold>

                <iperf_bitrate_threshold>80</iperf_bitrate_threshold>