@@ -47,7 +47,7 @@ get_samba_nightly_repo() {
4747get_distro_ceph_repo () {
4848 if [[ " ${OS_BASE} " = centos ]]; then
4949 dnf install --setopt=install_weak_deps=False -y \
50- centos-release-ceph-reef
50+ centos-release-ceph-squid
5151 fi
5252}
5353
@@ -74,38 +74,41 @@ package_selection="$4"
7474# shellcheck disable=SC1091
7575OS_BASE=" $( . /etc/os-release && echo " ${ID} " ) "
7676
77+ get_epel_repo_if_needed
78+
7779case " ${install_packages_from} " in
7880 samba-nightly)
7981 get_samba_nightly_repo
8082 get_distro_ceph_repo
81- get_epel_repo_if_needed
8283 package_selection=${package_selection:- nightly}
8384 ;;
8485 devbuilds)
8586 get_samba_nightly_repo
8687 # devbuilds - samba nightly dev builds and ceph dev builds
8788 get_ceph_shaman_repo
88- get_epel_repo_if_needed
8989 package_selection=${package_selection:- devbuilds}
9090 ;;
9191 custom-repo)
9292 get_custom_repo " ${install_custom_repo} "
9393 get_distro_ceph_repo
94- get_epel_repo_if_needed
94+ package_selection= ${package_selection :- custom}
9595 ;;
9696 custom-devbuilds)
9797 get_custom_repo " ${install_custom_repo} "
9898 get_ceph_shaman_repo
99- get_epel_repo_if_needed
100- package_selection=${package_selection:- devbuilds}
99+ package_selection=${package_selection:- custom-devbuilds}
100+ ;;
101+ * )
102+ get_distro_ceph_repo
103+ package_selection=${package_selection:- default}
101104 ;;
102105esac
103106
104107
105108dnf_cmd=(dnf)
106109if [[ " ${OS_BASE} " = centos ]]; then
107110 dnf_cmd+=(--enablerepo=crb)
108- if [[ " ${package_selection} " ! = " nightly " && " ${package_selection} " != " devbuilds " ]]; then
111+ if [[ " ${package_selection} " = " default " ]]; then
109112 dnf_cmd+=(--enablerepo=resilientstorage)
110113 fi
111114fi
@@ -132,7 +135,7 @@ case "${package_selection}-${OS_BASE}" in
132135 * -fedora|allvfs-* )
133136 samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
134137 ;;
135- devbuilds-centos|forcedevbuilds-* )
138+ * devbuilds-centos|forcedevbuilds-* )
136139 # Enable libcephfs proxy for dev builds
137140 support_packages+=(libcephfs-proxy2)
138141 # Fall through to next case
0 commit comments