Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add reef release #2120

Closed
wants to merge 2 commits into from
Closed

add reef release #2120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92530cd
add reef release
ljflores Jun 8, 2023
627ff5d
contrib: fix sloppy bash
ljflores Jun 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
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
FLAVORS ?= \
pacific,centos,8 \
quincy,centos,8 \
reef,centos,8 \
main,centos,8

TAG_REGISTRY ?= ceph
Expand Down Expand Up @@ -50,6 +51,7 @@ include maint-lib/makelib.mk
ALL_BUILDABLE_FLAVORS := \
pacific,centos,8 \
quincy,centos,8 \
reef,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 @@ -4,6 +4,12 @@ bash -c ' \
if [ -n "__GANESHA_PACKAGES__" ]; then \
if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \
curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=$(arch)" -o /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/storage/\$basearch/nfsganesha-4/" >> /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 ; \
Expand Down Expand Up @@ -50,7 +56,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 ]]; then \
elif [[ "${CEPH_VERSION}" =~ nautilus|octopus|pacific|quincy|reef ]]; 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
8 changes: 5 additions & 3 deletions 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)
CEPH_RELEASES=(main pacific quincy reef)
fi

HOST_ARCH=$(uname -m)
Expand Down Expand Up @@ -224,6 +224,8 @@ function create_head_or_point_release {
CEPH_RELEASES=(pacific)
elif [ "${CONTAINER_BRANCH}" == "stable-7.0" ]; then
CEPH_RELEASES=(quincy)
elif [ "${CONTAINER_BRANCH}" == "stable-8.0" ]; then
CEPH_RELEASES=(reef)
fi
else
set -e
Expand Down Expand Up @@ -254,13 +256,13 @@ function build_ceph_imgs {
make FLAVORS="${CONTAINER_FLAVOR}" \
BASEOS_TAG=stream"${CENTOS_RELEASE}" \
CEPH_DEVEL="true" \
OSD_FLAVOR=${OSD_FLAVOR} \
OSD_FLAVOR="${OSD_FLAVOR}" \
RELEASE="${RELEASE}" \
TAG_REGISTRY="${CONTAINER_REPO_ORGANIZATION}" \
IMAGES_TO_BUILD=daemon-base \
build.parallel
else
make BASEOS_TAG=stream"${CENTOS_RELEASE}" CEPH_DEVEL=${DEVEL} RELEASE="${RELEASE}" BASEOS_REGISTRY="${CONTAINER_REPO_HOSTNAME}/centos" BASEOS_REPO=centos TAG_REGISTRY="${CONTAINER_REPO_ORGANIZATION}" build.parallel
make BASEOS_TAG=stream"${CENTOS_RELEASE}" CEPH_DEVEL="${DEVEL}" RELEASE="${RELEASE}" BASEOS_REGISTRY="${CONTAINER_REPO_HOSTNAME}/centos" BASEOS_REPO=centos TAG_REGISTRY="${CONTAINER_REPO_ORGANIZATION}" build.parallel
fi
docker images
}
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"
AARCH64_FLAVORS_TO_BUILD="pacific,centos,8 quincy,centos,8"
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"

# Allow running this script with the env var ARCH='aarch64' to build arm images
# ARCH='x86_64'
Expand Down
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 @@ -51,6 +51,9 @@ function get_ceph_version {
*quincy*)
echo quincy
;;
*reef*)
echo reef
;;
*)
echo main
;;
Expand Down