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

branch squid #2174

Merged
merged 7 commits into from
Dec 8, 2023
Merged

branch squid #2174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8090504
squid: Add the release name to
rzarzynski Dec 5, 2023
0e4fed9
squid: Update __DOCKERFILE_INSTALL__ with the with the supported nfs-…
rzarzynski Dec 5, 2023
7d38ec0
squid: Update contrib/build-push-ceph-container-imgs.sh with the new …
rzarzynski Dec 5, 2023
68e95bd
squid: Update contrib/ceph-build-config.sh with the release name
rzarzynski Dec 5, 2023
dc15424
squid: Update contrib/common.sh with supported version numbers
rzarzynski Dec 5, 2023
d558dca
squid: Update maint-lib/ceph_version.sh with the release name
rzarzynski Dec 5, 2023
3fd61c3
squid: make the RHCS workflow aware about reef and squid
rzarzynski Dec 8, 2023
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
8 changes: 7 additions & 1 deletion .github/workflows/rhcs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,10 @@ jobs:
run: VERSION=5 CEPH_RELEASE=pacific ./contrib/compose-rhcs.sh

- name: compose the RHCS 6 container image
run: VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh
run: VERSION=6 CEPH_RELEASE=quincy ./contrib/compose-rhcs.sh

- name: compose the RHCS 7 container image
run: VERSION=7 CEPH_RELEASE=reef ./contrib/compose-rhcs.sh

- name: compose the RHCS 8 container image
run: VERSION=8 CEPH_RELEASE=squid ./contrib/compose-rhcs.sh
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ FLAVORS ?= \
pacific,centos,8 \
quincy,centos,8 \
reef,centos,8 \
squid,centos,8 \
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember when we branched reef I was told squid would be built on el9-based images, are we going to continue with el8 at the end?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, so please let me loop @cbodley in.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@guits we're still planning to drop el8 for squid, it's just been a slog to actually get el9 container builds working. i'll cc you on a discussion in the #sepia slack where dmick identified some missing packages need by the container build

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be fine to merge as is, with squid-on-el8, and later – when we're ready – switch squid to to el9?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

absolutely, this shouldn't block the pr

there are separate discussions about the fate of this ceph-container repo in #2171 and moving the container builds into the ceph repo with ceph/ceph#54575. hopefully that can happen for squid, but someone will need to take the initiative on that

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thanks @cbodley for clarifying.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be fine to merge as is, with squid-on-el8, and later – when we're ready – switch squid to to el9?

sure, I don't see anything that would block this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mind linking to that Slack thread here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

never tried to link a thread before - hope this works? https://ceph-storage.slack.com/archives/C1HFJ4VTN/p1701386424620719

main,centos,8

TAG_REGISTRY ?= ceph
Expand Down Expand Up @@ -52,6 +53,7 @@ ALL_BUILDABLE_FLAVORS := \
pacific,centos,8 \
quincy,centos,8 \
reef,centos,8 \
squid,centos,8 \
main,centos,8

# ==============================================================================
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 @@ -5,6 +5,12 @@ bash -c ' \
if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \
ARCH=$(arch); if [[ "${ARCH}" == "aarch64" ]]; then ARCH="arm64"; fi ; \
curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/V5.7/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=${ARCH}" -o /etc/yum.repos.d/ganesha.repo ; \
elif [[ "${CEPH_VERSION}" == 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 ; \
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 ; \
Expand Down Expand Up @@ -57,7 +63,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 ; \
Expand Down
2 changes: 1 addition & 1 deletion contrib/build-push-ceph-container-imgs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ OSD_FLAVOR=${OSD_FLAVOR:=default}

if [ -z "$CEPH_RELEASES" ]; then
# NEVER change 'main' position in the array, this will break the 'latest' tag
CEPH_RELEASES=(main pacific quincy reef)
CEPH_RELEASES=(main pacific quincy reef squid)
fi

HOST_ARCH=$(uname -m)
Expand Down
4 changes: 2 additions & 2 deletions contrib/ceph-build-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ trap 'exit $?' ERR
# These build scripts don't need to have the aarch64 part of the distro specified
# I.e., specifying 'luminous,centos-arm64,7' is not necessary for aarch64 builds; these scripts
# will do the right build. See configurable CENTOS_AARCH64_FLAVOR_DISTRO below
X86_64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8"
AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8"
X86_64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8"
AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8 reef,centos,8 squid,centos,8"

# Allow running this script with the env var ARCH='aarch64' to build arm images
# ARCH='x86_64'
Expand Down
6 changes: 5 additions & 1 deletion contrib/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@ case "${VERSION}" in
UBI_VERSION=9
CEPH_RELEASE=reef
;;
*8*)
UBI_VERSION=9
CEPH_RELEASE=squid
;;
*)
echo "ERROR: VERSION must be set to 5, 6 or 7."
echo "ERROR: VERSION must be set to 6, 7 or 8."
exit 1
esac

3 changes: 3 additions & 0 deletions maint-lib/ceph_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ function get_ceph_version {
*reef*)
echo reef
;;
*squid*)
echo squid
;;
*)
echo main
;;
Expand Down
Loading