Skip to content
Snippets Groups Projects
Commit 127f89f6 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

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

parent ba761254
No related branches found
No related tags found
1 merge request!44chore(ci): stopping support for RHEL8/Rocky8 in favor of RHEL9/Rocky9
Pipeline #42154 passed
Subproject commit 1658381e06a477c79d34508f10610e54ff1e62ef Subproject commit db9313335abd67c2b19394bc7bc9526861d1432c
...@@ -137,7 +137,6 @@ check_install_pcf_deps() { ...@@ -137,7 +137,6 @@ check_install_pcf_deps() {
check \ check \
nettle-devel \ nettle-devel \
libcurl-devel \ libcurl-devel \
python2 \
pkgconfig \ pkgconfig \
ninja-build \ ninja-build \
boost-devel \ boost-devel \
......
...@@ -204,7 +204,7 @@ pipeline { ...@@ -204,7 +204,7 @@ pipeline {
sh "oc delete -f openshift/build-config.yaml || true" 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 "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 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 // 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 // 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" 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"
......
...@@ -58,7 +58,7 @@ class HtmlReport(): ...@@ -58,7 +58,7 @@ class HtmlReport():
with open(os.path.join(cwd, REPORT_NAME), 'w') as wfile: with open(os.path.join(cwd, REPORT_NAME), 'w') as wfile:
wfile.write(generate_header(args)) wfile.write(generate_header(args))
wfile.write(generate_git_info(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(coding_formatting_log_check(args))
wfile.write(analyze_sca_log_check()) wfile.write(analyze_sca_log_check())
wfile.write(generate_footer()) wfile.write(generate_footer())
......
...@@ -21,14 +21,14 @@ ...@@ -21,14 +21,14 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface PCF service # 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 # 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 ENV IS_DOCKERFILE=1
...@@ -40,11 +40,11 @@ COPY ./rhsm-conf /etc/rhsm ...@@ -40,11 +40,11 @@ COPY ./rhsm-conf /etc/rhsm
COPY ./rhsm-ca /etc/rhsm/ca COPY ./rhsm-ca /etc/rhsm/ca
RUN rm -f /etc/rhsm-host && \ RUN rm -f /etc/rhsm-host && \
yum repolist --disablerepo=* && \ subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \ dnf update -y && \
yum update -y && \ # here just to display the current version
cat /etc/os-release && \ cat /etc/os-release && \
yum install -y \ dnf install -y \
psmisc \ psmisc \
git \ git \
diffutils \ diffutils \
...@@ -78,7 +78,7 @@ FROM mikefarah/yq:latest as yq-source ...@@ -78,7 +78,7 @@ FROM mikefarah/yq:latest as yq-source
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# TARGET IMAGE # 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 ENV TZ=Europe/Paris
# Copy the entitlements # Copy the entitlements
......
...@@ -21,19 +21,18 @@ ...@@ -21,19 +21,18 @@
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# #
# Dockerfile for the Open-Air-Interface PCF service # Dockerfile for the Open-Air-Interface PCF service
# Valid for Rocky Linux 8.7+ # Valid for Rocky Linux 9.+
# #
#--------------------------------------------------------------------- #---------------------------------------------------------------------
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# BUILDER IMAGE # BUILDER IMAGE
#--------------------------------------------------------------------- #---------------------------------------------------------------------
FROM docker.io/rockylinux:8 AS oai-pcf-builder FROM docker.io/rockylinux:9 AS oai-pcf-builder
ENV IS_DOCKERFILE=1 ENV IS_DOCKERFILE=1
RUN dnf install 'dnf-command(config-manager)' -y && \ RUN dnf install 'dnf-command(config-manager)' -y && \
dnf config-manager --set-enabled powertools && \
dnf install epel-release -y && crb enable && \ dnf install epel-release -y && crb enable && \
dnf update -y && \ dnf update -y && \
# here just to display the current version # here just to display the current version
...@@ -69,7 +68,7 @@ FROM mikefarah/yq:latest as yq-source ...@@ -69,7 +68,7 @@ FROM mikefarah/yq:latest as yq-source
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# TARGET IMAGE # TARGET IMAGE
#--------------------------------------------------------------------- #---------------------------------------------------------------------
FROM docker.io/rockylinux:8-minimal as oai-pcf FROM docker.io/rockylinux:9-minimal as oai-pcf
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
# We install some debug tools for the moment in addition of mandatory libraries # We install some debug tools for the moment in addition of mandatory libraries
...@@ -116,7 +115,7 @@ RUN ldconfig && \ ...@@ -116,7 +115,7 @@ RUN ldconfig && \
# The configuration folder will be flat # The configuration folder will be flat
WORKDIR /openair-pcf/etc WORKDIR /openair-pcf/etc
COPY --from=oai-pcf-builder \ COPY --from=oai-pcf-builder \
/openair-pcf/etc/pcf.yaml \ /openair-pcf/etc/config.yaml \
./ ./
WORKDIR /openair-pcf WORKDIR /openair-pcf
...@@ -129,4 +128,4 @@ HEALTHCHECK --interval=10s \ ...@@ -129,4 +128,4 @@ HEALTHCHECK --interval=10s \
--retries=6 \ --retries=6 \
CMD /openair-pcf/bin/healthcheck.sh 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"]
...@@ -39,7 +39,7 @@ spec: ...@@ -39,7 +39,7 @@ spec:
destinationDir: rhsm-ca destinationDir: rhsm-ca
strategy: strategy:
dockerStrategy: dockerStrategy:
dockerfilePath: "docker/Dockerfile.pcf.rhel8" dockerfilePath: "docker/Dockerfile.pcf.rhel9"
output: output:
to: to:
kind: "ImageStreamTag" kind: "ImageStreamTag"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment