From 7ef8829167a342466342bc5a67a09830e310e989 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Tue, 5 Aug 2025 09:41:01 +0200
Subject: [PATCH] Use archiveArtifact() for cls_native.Build()

---
 ci-scripts/cls_native.py | 13 +++++--------
 ci-scripts/main.py       |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ci-scripts/cls_native.py b/ci-scripts/cls_native.py
index fe508b84e3..86268a7dc1 100644
--- a/ci-scripts/cls_native.py
+++ b/ci-scripts/cls_native.py
@@ -28,27 +28,24 @@ import cls_cmd
 import cls_oai_html
 import cls_analysis
 import constants as CONST
+from cls_ci_helper import archiveArtifact
 
-LOG_PATH_PHYSIM = 'phy_sim_logs'
 DPDK_PATH = '/opt/dpdk-t2-22.11.0'
 
 class Native():
 
-	def Build(test_case, HTML, host, directory, options):
+	def Build(ctx, test_case, HTML, host, directory, options):
 		logging.debug(f'Building on server: {host}')
 		HTML.testCase_id = test_case
 
 		with cls_cmd.getConnection(host) as ssh:
 			base = f"{directory}/cmake_targets"
-			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)
+			ret = ssh.run(f"C_INCLUDE_PATH={DPDK_PATH}/include/ PKG_CONFIG_PATH={DPDK_PATH}/lib64/pkgconfig/ {base}/build_oai {options} > {base}/build_oai.log", timeout=900)
 			success = ret.returncode == 0
-			logs = ssh.run(f"cat {base}/log/build_oai.log", silent=True)
+			logs = ssh.run(f"cat {base}/build_oai.log", silent=True)
 			logging.debug(f"build finished with code {ret.returncode}, output:\n{logs.stdout}")
 
-			# create log directory, and copy build logs
-			target = f"{base}/build_log_{test_case}/"
-			ssh.run(f"mkdir -p {target}")
-			ssh.run(f"mv {base}/log/* {target}")
+			archiveArtifact(ssh, ctx, f'{base}/build_oai.log')
 
 			# check if build artifacts are there
 			# NOTE: build_oai should fail with exit code if it could not build, but it does not
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 035437ac8a..317b32b0f9 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -136,7 +136,7 @@ def ExecuteActionWithParam(action, ctx):
 		if proxy_commit is not None:
 			CONTAINERS.proxyCommit = proxy_commit
 		if action == 'Build_eNB':
-			success = cls_native.Native.Build(HTML.testCase_id, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
+			success = cls_native.Native.Build(ctx, HTML.testCase_id, HTML, RAN.eNBIPAddress, RAN.eNBSourceCodePath, RAN.Build_eNB_args)
 		elif action == 'Build_Image':
 			success = CONTAINERS.BuildImage(HTML)
 		elif action == 'Build_Proxy':