Skip to content
This repository has been archived by the owner on Dec 19, 2024. It is now read-only.

squid: add gmonitoring package #2238

Merged
merged 3 commits into from
Sep 24, 2024
Merged

squid: add gmonitoring package #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc8a84d
tests: build quincy, reef and squid for arm64
guits Sep 20, 2024
528a753
squid: bump to nfs-ganesha 6.0
guits Sep 16, 2024
443ea41
squid: add gmonitoring package
guits Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/workflows/container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,8 @@ jobs:
os: [9]
ceph_release: [quincy, reef, squid, main]
exclude:
- os: 9
ceph_release: squid
- os: 9
ceph_release: quincy
- os: 9
ceph_release: reef
runs-on: ubuntu-latest
steps:
- name: checkout
Expand Down
8 changes: 4 additions & 4 deletions ceph-releases/ALL/centos-arm64/9/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ yum install -y epel-release && \
yum install -y jq && \
bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" =~ master|main|reef|squid ]]; then \
if [[ "${CEPH_VERSION}" =~ master|main|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 "baseurl=https://buildlogs.centos.org/centos/\$releasever-stream/storage/\$basearch/nfsganesha-6/" >> /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 \
elif [[ "${CEPH_VERSION}" =~ quincy|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/storage/\$basearch/nfsganesha-4/" >> /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}" == pacific ]]; then \
Expand Down
8 changes: 7 additions & 1 deletion ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ yum install -y epel-release && \
yum install -y jq && \
bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" =~ master|main|quincy|reef|squid ]]; then \
if [[ "${CEPH_VERSION}" =~ master|main|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-6/" >> /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|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 ; \
Expand Down
1 change: 1 addition & 0 deletions ceph-releases/quincy/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind
2 changes: 1 addition & 1 deletion ceph-releases/quincy/centos-arm64/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../src/daemon-base/__GANESHA_PACKAGES__
../../quincy/__GANESHA_PACKAGES__
1 change: 1 addition & 0 deletions ceph-releases/reef/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind
2 changes: 1 addition & 1 deletion ceph-releases/reef/centos-arm64/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../../../src/daemon-base/__GANESHA_PACKAGES__
../../reef/__GANESHA_PACKAGES__
1 change: 0 additions & 1 deletion ceph-releases/squid/centos/__GANESHA_PACKAGES__
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/daemon-base/__GANESHA_PACKAGES__
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind
nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls sssd-client dbus-daemon rpcbind gmonitoring
Loading