Rename ubuntuXX to ubuntu

ci-scripts/cls_containerize.py

@@ -298,7 +298,7 @@ class Containerize():
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
-			self.dockerfileprefix = '.ubuntu24'
+			self.dockerfileprefix = '.ubuntu'
 			self.cliBuildOptions = ''
 		elif self.host == 'Red Hat':
 			self.cli = 'sudo podman'
@@ -337,7 +337,7 @@ class Containerize():
 				imageNames.append(('oai-gnb', 'gNB.fhi72', 'oai-gnb-fhi72', ''))
 		result = re.search('build_cross_arm64', self.imageKind)
 		if result is not None:
-			self.dockerfileprefix = '.ubuntu22.cross-arm64'
+			self.dockerfileprefix = '.ubuntu.cross-arm64'
 		result = re.search('native_arm', self.imageKind)
 		if result is not None:
 			imageNames.append(('oai-gnb', 'gNB', 'oai-gnb', ''))
@@ -625,7 +625,7 @@ class Containerize():
 			return False
 
 		# build ran-unittests image
-		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu24"
+		dockerfile = "ci-scripts/docker/Dockerfile.unittest.ubuntu"
 		logfile = f'{lSourcePath}/cmake_targets/log/unittest-build.log'
 		ret = cmd.run(f'docker build --progress=plain --tag ran-unittests:{baseTag} --file {dockerfile} . &> {logfile}')
 		archiveArtifact(cmd, ctx, logfile)

ci-scripts/cls_static_code_analysis.py

@@ -212,7 +212,7 @@ class StaticCodeAnalysis():
 		logDir = f'{lSourcePath}/cmake_targets/log/'
 		cmd.run(f'mkdir -p {logDir}')
 		cmd.run('docker image rm oai-formatting-check:latest')
-		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.bionic {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
+		cmd.run(f'docker build --target oai-formatting-check --tag oai-formatting-check:latest {check_options} --file {lSourcePath}/ci-scripts/docker/Dockerfile.formatting.ubuntu {lSourcePath} > {logDir}/oai-formatting-check.txt 2>&1')
 
 		cmd.run('docker image rm oai-formatting-check:latest')
 		cmd.run('docker image prune --force')

ci-scripts/yaml_files/local_common_overrides/build_images.yaml

@@ -3,7 +3,7 @@ services:
     image: ran-base
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.base.ubuntu22
+      dockerfile: docker/Dockerfile.base.ubuntu
       tags:
         - ran-base
 
@@ -11,7 +11,7 @@ services:
     image: ran-build
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.build.ubuntu22
+      dockerfile: docker/Dockerfile.build.ubuntu
       tags:
         - ran-build
     depends_on:
@@ -22,7 +22,7 @@ services:
     image: gnb-local
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.gNB.ubuntu22
+      dockerfile: docker/Dockerfile.gNB.ubuntu
       tags:
         - gnb-local
     depends_on:
@@ -35,7 +35,7 @@ services:
     image: ue-local
     build:
       context: ../../../
-      dockerfile: docker/Dockerfile.nrUE.ubuntu22
+      dockerfile: docker/Dockerfile.nrUE.ubuntu
       tags:
         - ue-local
     depends_on: