Merge branch 'migrating-to-rhel9-rocky9' into 'develop'

chore(ci): stopping support for RHEL8/Rocky8 in favor of RHEL9/Rocky9

See merge request !44

common-build @ db931333

-Subproject commit 1658381e06a477c79d34508f10610e54ff1e62ef
+Subproject commit db9313335abd67c2b19394bc7bc9526861d1432c

build/scripts/build_helper.pcf

@@ -137,7 +137,6 @@ check_install_pcf_deps() {
       check \
       nettle-devel \
       libcurl-devel \
-      python2 \
       pkgconfig \
       ninja-build \
       boost-devel \

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -204,7 +204,7 @@ pipeline {
                   sh "oc delete -f openshift/build-config.yaml || true"
                   sh "sed -i -e 's@oai-pcf:latest@oai-pcf:${pcf_tag}@g' openshift/build-config.yaml"
                   sh "oc create -f openshift/build-config.yaml"
-                  sh "oc start-build pcf-build-cfg  --from-file=./"
+                  sh 'oc start-build pcf-build-cfg  --from-dir=./ --exclude=""'
                   // need python to wait for pod pcf-build-cfg-1-build to be Completed or Error
                   // it fails if it detects error or timeout at 20 minutes
                   sh "./ci-scripts/common/python/check_build_pod_status.py --pod-name pcf-build-cfg-1-build --log-file archives/pcf_rhel_image_build.log"

ci-scripts/generateHtmlReport.py

@@ -58,7 +58,7 @@ class HtmlReport():
         with open(os.path.join(cwd, REPORT_NAME), 'w') as wfile:
             wfile.write(generate_header(args))
             wfile.write(generate_git_info(args))
-            wfile.write(build_summary(args, 'pcf', '22', '8'))
+            wfile.write(build_summary(args, 'pcf', '22', '9'))
             wfile.write(coding_formatting_log_check(args))
             wfile.write(analyze_sca_log_check())
             wfile.write(generate_footer())

docker/Dockerfile.pcf.rhel8 → docker/Dockerfile.pcf.rhel9

@@ -21,14 +21,14 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface PCF service
-#   Valid for UBI 8.6 | RHEL 8.6
+#   Valid for UBI 9.x | RHEL 9.x
 #
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
 # BUILDER IMAGE
 #---------------------------------------------------------------------
-FROM registry.access.redhat.com/ubi8/ubi:latest AS oai-pcf-builder
+FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-pcf-builder
 
 ENV IS_DOCKERFILE=1
 
@@ -40,11 +40,11 @@ COPY ./rhsm-conf /etc/rhsm
 COPY ./rhsm-ca /etc/rhsm/ca
 
 RUN rm -f /etc/rhsm-host && \
-    yum repolist --disablerepo=* && \
-    subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \
-    yum update -y && \
+    subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
+    dnf update -y && \
+    # here just to display the current version
     cat /etc/os-release && \
-    yum install -y \
+    dnf install -y \
         psmisc \
         git \
         diffutils \
@@ -78,7 +78,7 @@ FROM mikefarah/yq:latest as yq-source
 #---------------------------------------------------------------------
 # TARGET IMAGE
 #---------------------------------------------------------------------
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest as oai-pcf
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest as oai-pcf
 ENV TZ=Europe/Paris
 
 # Copy the entitlements

docker/Dockerfile.pcf.rocky8 → docker/Dockerfile.pcf.rocky9

@@ -21,19 +21,18 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the Open-Air-Interface PCF service
-#   Valid for Rocky Linux 8.7+
+#   Valid for Rocky Linux 9.+
 #
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
 # BUILDER IMAGE
 #---------------------------------------------------------------------
-FROM docker.io/rockylinux:8 AS oai-pcf-builder
+FROM docker.io/rockylinux:9 AS oai-pcf-builder
 
 ENV IS_DOCKERFILE=1
 
 RUN dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled powertools && \
     dnf install epel-release -y && crb enable && \
     dnf update -y && \
     # here just to display the current version
@@ -69,7 +68,7 @@ FROM mikefarah/yq:latest as yq-source
 #---------------------------------------------------------------------
 # TARGET IMAGE
 #---------------------------------------------------------------------
-FROM docker.io/rockylinux:8-minimal as oai-pcf
+FROM docker.io/rockylinux:9-minimal as oai-pcf
 ENV TZ=Europe/Paris
 
 # We install some debug tools for the moment in addition of mandatory libraries
@@ -116,7 +115,7 @@ RUN ldconfig && \
 # The configuration folder will be flat
 WORKDIR /openair-pcf/etc
 COPY --from=oai-pcf-builder \
-    /openair-pcf/etc/pcf.yaml \
+    /openair-pcf/etc/config.yaml \
     ./
 
 WORKDIR /openair-pcf
@@ -129,4 +128,4 @@ HEALTHCHECK --interval=10s \
             --retries=6 \
     CMD /openair-pcf/bin/healthcheck.sh
 
-CMD ["/openair-pcf/bin/oai_pcf", "-c", "/openair-pcf/etc/pcf.yaml", "-o"]
+CMD ["/openair-pcf/bin/oai_pcf", "-c", "/openair-pcf/etc/config.yaml", "-o"]

openshift/build-config.yaml

@@ -39,7 +39,7 @@ spec:
             destinationDir: rhsm-ca
     strategy:
         dockerStrategy:
-            dockerfilePath: "docker/Dockerfile.pcf.rhel8"
+            dockerfilePath: "docker/Dockerfile.pcf.rhel9"
     output:
         to:
             kind: "ImageStreamTag"