From 087ec202f74d9f6c025b7e84215e62f2b6532343 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Mon, 9 Jan 2023 13:40:37 +0100 Subject: [PATCH 1/2] cents: add support for CentOS 9 Signed-off-by: Ernesto Puerta --- .github/workflows/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fe8478c73..400229d4e8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,7 +25,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [centos_stream8] + os: [centos_stream8, centos_stream9] + include: + - os: centos_stream8 + centos_version: 8 + - os: centos_stream9 + centos_version: 9 steps: - name: Checkout uses: actions/checkout@master @@ -52,15 +57,18 @@ jobs: branch: [main, reef, quincy, pacific] name: [ceph, ceph-rpm] include: + - centos_version: 8 - name: ceph dir: ceph - name: ceph-rpm dir: ceph/rpm + - branch: main + centos_version: 9 steps: - 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: From 274c58b11e345ab20e13ac53ebe1707db3ff9d6b Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Sun, 16 Jun 2024 18:42:10 +0530 Subject: [PATCH 2/2] remove centos 8 centos8 is failing contionusly to pull and install its repos so this is an attempt to remove it completely and see if it passes Signed-off-by: Nizamudeen A --- .github/workflows/main.yml | 8 ++------ docker/ceph/Dockerfile | 4 ++-- docker/ceph/centos/Dockerfile | 22 ++++++++++++---------- docker/ceph/e2e/Dockerfile | 5 +++-- docker/ceph/rpm/Dockerfile | 4 ++-- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 400229d4e8..843771b4bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,10 +25,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [centos_stream8, centos_stream9] + os: [centos_stream9] include: - - os: centos_stream8 - centos_version: 8 - os: centos_stream9 centos_version: 9 steps: @@ -57,13 +55,11 @@ jobs: branch: [main, reef, quincy, pacific] name: [ceph, ceph-rpm] include: - - centos_version: 8 + - centos_version: 9 - name: ceph dir: ceph - name: ceph-rpm dir: ceph/rpm - - branch: main - centos_version: 9 steps: - name: Checkout uses: actions/checkout@master diff --git a/docker/ceph/Dockerfile b/docker/ceph/Dockerfile index ce294319e7..bbc1df9dba 100644 --- 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 index 3ebafc683b..4c58ebbfaf 100644 --- 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 index e0cfc9cd80..6555a0a58f 100644 --- 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 index 85b645bf07..41a187d09a 100644 --- 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