@@ -64,15 +64,26 @@ get_samba_nightly_repo() {
64
64
65
65
get_sig_samba_repo () {
66
66
if [[ " ${OS_BASE} " = centos ]]; then
67
- dnf install --setopt=install_weak_deps=False -y \
68
- centos-release-samba
67
+ if [[ -z $1 ]]; then
68
+ dnf install --setopt=install_weak_deps=False -y \
69
+ centos-release-samba
70
+ else
71
+ dnf install --setopt=install_weak_deps=False -y \
72
+ centos-release-samba" ${1// .} "
73
+ fi
69
74
fi
70
75
}
71
76
77
+ # shellcheck disable=SC2120
72
78
get_distro_ceph_repo () {
73
79
if [[ " ${OS_BASE} " = centos ]]; then
74
- dnf install --setopt=install_weak_deps=False -y \
75
- centos-release-ceph
80
+ if [[ -z $1 ]]; then
81
+ dnf install --setopt=install_weak_deps=False -y \
82
+ centos-release-ceph
83
+ else
84
+ dnf install --setopt=install_weak_deps=False -y \
85
+ centos-release-ceph-" ${1} "
86
+ fi
76
87
fi
77
88
}
78
89
@@ -148,6 +159,15 @@ case "${install_packages_from}" in
148
159
get_ceph_shaman_repo
149
160
package_selection=${package_selection:- custom-devbuilds}
150
161
;;
162
+ ceph20)
163
+ get_sig_samba_repo " 4.22"
164
+ # Replace the following with 'get_distro_ceph_repo "tentacle"'
165
+ # once tentacle builds are out and remove the shellcheck waiver
166
+ # for get_distro_ceph_repo
167
+ CEPH_REPO_REF=tentacle
168
+ get_ceph_shaman_repo
169
+ package_selection=${package_selection:- stable}
170
+ ;;
151
171
* )
152
172
get_sig_samba_repo
153
173
get_distro_ceph_repo
@@ -183,7 +203,7 @@ case "${package_selection}-${OS_BASE}" in
183
203
* -fedora|allvfs-* )
184
204
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
185
205
;;
186
- * devbuilds-centos|forcedevbuilds-* )
206
+ * devbuilds-centos|forcedevbuilds-* |stable- * )
187
207
# Enable libcephfs proxy for dev builds
188
208
support_packages+=(libcephfs-proxy2)
189
209
# Fall through to next case
0 commit comments