From 08b1ab54e11946f162e232e2750e80887689df30 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 6 Feb 2024 12:17:16 -0800 Subject: [PATCH] centos9: add squid, use CentOS CI for ganesha on reef and squid Signed-off-by: Dan Mick --- .../centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ | 10 ++-------- .../ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__ | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ index 4c7e7eb8d..51d29e1ff 100644 --- a/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__ @@ -2,19 +2,13 @@ yum install -y epel-release && \ yum install -y jq && \ bash -c ' \ if [ -n "__GANESHA_PACKAGES__" ]; then \ - if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \ + if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \ ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \ echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ - elif [[ "${CEPH_VERSION}" == reef ]]; then \ - echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ - echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ elif [[ "${CEPH_VERSION}" == quincy ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ @@ -61,7 +55,7 @@ bash -c ' \ curl -s -L https://shaman.ceph.com/api/repos/tcmu-runner/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo?arch=$(arch) -o /etc/yum.repos.d/tcmu-runner.repo ; \ if [[ "${CEPH_VERSION}" =~ master || "${CEPH_VERSION}" == main ]]; then \ curl -s -L https://shaman.ceph.com/api/repos/ceph-iscsi/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ - elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef ]]; then \ + elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef|squid ]]; then \ curl -s -L https://download.ceph.com/ceph-iscsi/3/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ else \ curl -s -L https://download.ceph.com/ceph-iscsi/2/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ diff --git a/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__ index 4d0a004e2..15d3b70a8 100644 --- a/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/9/daemon-base/__DOCKERFILE_INSTALL__ @@ -2,13 +2,7 @@ yum install -y epel-release && \ yum install -y jq && \ bash -c ' \ if [ -n "__GANESHA_PACKAGES__" ]; then \ - if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \ - echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ - echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \ - echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo ; \ - elif [[ "${CEPH_VERSION}" == reef ]]; then \ + if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \ echo "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-5/" >> /etc/yum.repos.d/ganesha.repo ; \ @@ -60,7 +54,7 @@ bash -c ' \ curl -s -L https://shaman.ceph.com/api/repos/tcmu-runner/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo?arch=$(arch) -o /etc/yum.repos.d/tcmu-runner.repo ; \ if [[ "${CEPH_VERSION}" =~ master || "${CEPH_VERSION}" == main ]]; then \ curl -s -L https://shaman.ceph.com/api/repos/ceph-iscsi/main/latest/centos/__ENV_[DISTRO_VERSION]__/repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ - elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef ]]; then \ + elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef|squid ]]; then \ curl -s -L https://download.ceph.com/ceph-iscsi/3/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \ else \ curl -s -L https://download.ceph.com/ceph-iscsi/2/rpm/el__ENV_[DISTRO_VERSION]__/ceph-iscsi.repo -o /etc/yum.repos.d/ceph-iscsi.repo ; \