Merge pull request #70 from rhcs-dashboard/centos_9

cents: add support for CentOS 9
rhcs-dashboard · Jul 11, 2024 · 6d996d1 · 6d996d1
2 parents 99bdde2 + 274c58b
commit 6d996d1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [centos_stream8]
+        os: [centos_stream9]
+        include:
+          - os: centos_stream9
+            centos_version: 9
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -52,6 +55,7 @@ jobs:
         branch: [main, reef, quincy, pacific]
         name: [ceph, ceph-rpm]
         include:
+          - centos_version: 9
           - name: ceph
             dir: ceph
           - name: ceph-rpm
@@ -60,7 +64,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
     - name: Build
-      run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }}
+      run: docker build -t docker.io/rhcsdashboard/${{ matrix.name }}:${{ matrix.branch }} -f docker/${{ matrix.dir }}/${{ matrix.branch_dir}}/Dockerfile ./docker/ceph --build-arg CEPH_RELEASE=${{ matrix.branch }} --build-arg VCS_BRANCH=${{ matrix.branch }} --build-arg CENTOS_VERSION=${{ matrix.centos_version }}
     - name: Google Chat Notification
       uses: Co-qn/google-chat-notification@b9227d9daa4638c9782a5bd16c4abb86268127a1
       with:

diff --git a/docker/ceph/Dockerfile b/docker/ceph/Dockerfile
@@ -1,9 +1,9 @@
-ARG CENTOS_VERSION=8
+ARG CENTOS_VERSION=9
 FROM rhcsdashboard/ceph-base:centos_stream${CENTOS_VERSION}
 ARG CENTOS_VERSION
 
 # Required in order for build-doc to run successfully:
-RUN pip3 install -U Cython==0.29.3
+RUN pip3 install -U Cython
 
 RUN dnf install -y bc ccache systemd-udev \
     && dnf clean packages

diff --git a/docker/ceph/centos/Dockerfile b/docker/ceph/centos/Dockerfile
@@ -1,22 +1,20 @@
-ARG CENTOS_VERSION=8
+ARG CENTOS_VERSION=9
 FROM quay.io/centos/centos:stream$CENTOS_VERSION as ceph-base
 ARG CENTOS_VERSION
 
-RUN dnf --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos -y
-RUN dnf distro-sync -y
-
 RUN dnf install -y epel-release \
     && dnf clean packages
-RUN dnf install -y bind-utils curl dnf dnf-plugins-core git golang-github-prometheus hostname \
+RUN dnf install -y bind-utils dnf dnf-plugins-core git golang-github-prometheus hostname \
     iproute iputils jq jsonnet lsof net-tools procps-ng \
     python3-jinja2 python3-jsonpatch python3-pip util-linux which \
     && dnf clean packages
 
+RUN dnf config-manager --set-enabled crb
+RUN dnf distro-sync -y
+
 RUN sed -i 's/gpgcheck=1/gpgcheck=0/' /etc/dnf/dnf.conf
 RUN sed -i 's/skip_if_unavailable=False/skip_if_unavailable=True/' /etc/dnf/dnf.conf
 
-RUN dnf config-manager --set-enabled powertools
-
 RUN pip3 install -U pip
 
 # Sanity checks:
@@ -50,16 +48,20 @@ RUN dnf install -y ant doxygen libxslt-devel libxml2-devel graphviz python3-deve
     python3-Cython \
     && dnf clean packages
 
+# Conflicting versions of virtualenv causes issues with tox.
+RUN pip3 uninstall -y virtualenv
+RUN pip3 install virtualenv
+
 # For dev. mode: run backend unit tests.
-RUN dnf install -y libtool-ltdl-devel libxml2-devel python36-devel xmlsec1-devel xmlsec1-openssl-devel \
+RUN dnf install -y libtool-ltdl-devel libxml2-devel xmlsec1-devel xmlsec1-openssl-devel \
     && dnf clean packages
 
 # SSO (after installing xmlsec deps).
 RUN pip3 install python3-saml==1.9.0
 
 # NFS Ganesha.
-RUN dnf install -y centos-release-nfs-ganesha30 \
-    && dnf install -y nfs-ganesha-ceph nfs-ganesha-rados-grace nfs-ganesha-rados-urls \
+RUN dnf install -y centos-release-nfs-ganesha5 centos-release-ceph-reef \
+    && dnf install -y libcephfs2 nfs-ganesha-ceph nfs-ganesha-rados-grace nfs-ganesha-rados-urls \
     && dnf clean packages
 
 # S3 benchmark:

diff --git a/docker/ceph/e2e/Dockerfile b/docker/ceph/e2e/Dockerfile
@@ -1,7 +1,8 @@
-ARG CENTOS_VERSION=8
+ARG CENTOS_VERSION=9
 FROM quay.io/centos/centos:stream$CENTOS_VERSION
 
-RUN dnf --disablerepo '*' --enablerepo=extras swap centos-linux-repos centos-stream-repos -y
+RUN dnf install -y bind-utils dnf dnf-plugins-core
+RUN dnf config-manager --set-enabled crb
 RUN dnf distro-sync -y
 
 RUN dnf install -y https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm \

diff --git a/docker/ceph/rpm/Dockerfile b/docker/ceph/rpm/Dockerfile
@@ -1,11 +1,11 @@
-ARG CENTOS_VERSION=8
+ARG CENTOS_VERSION=9
 FROM rhcsdashboard/ceph-base:centos_stream${CENTOS_VERSION}
 ARG CENTOS_VERSION
 
 # Sepia provide missing dependencies until epel provide all dependencies.
 RUN dnf config-manager --add-repo http://apt-mirror.front.sepia.ceph.com/lab-extras/${CENTOS_VERSION}/
 RUN dnf config-manager --setopt gpgcheck=0 apt-mirror.front.sepia.ceph.com_lab-extras_${CENTOS_VERSION}_ --save
-RUN dnf copr enable -y ktdreyer/ceph-el${CENTOS_VERSION}
+RUN dnf copr enable -y ceph/el${CENTOS_VERSION}
 
 ARG USE_REPO_FILES=0
 ARG REPO_URL