Skip to content

merge queue: embarking master (53799e0) and #209 together #217

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

Closed
wants to merge 4 commits into from
+41 −6
Closed

merge queue: embarking master (53799e0) and #209 together #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2be4234
images/server: Add 'ceph20' package source for ceph tentacle
anoopcs9 Jun 17, 2025
a8b0e9b
hack/build-image: Define 'ceph20' package source
anoopcs9 Jul 10, 2025
d72eb7f
workflows: Enable samba-server builds for ceph20 source
anoopcs9 Jul 31, 2025
f208a89
Merge of #209
mergify[bot] Aug 12, 2025
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
13 changes: 13 additions & 0 deletions .github/workflows/container-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
- package_source: devbuilds
os: centos
arch: amd64
- package_source: ceph20
os: centos
arch: amd64
runs-on: ubuntu-latest
env:
BUILDAH_FORMAT: oci
Expand Down Expand Up @@ -174,6 +177,9 @@ jobs:
- package_source: devbuilds
os: centos
arch: amd64
- package_source: ceph20
os: centos
arch: amd64
needs: build-server
runs-on: ubuntu-latest
env:
Expand Down Expand Up @@ -286,6 +292,11 @@ jobs:
with:
image: "samba-server:devbuilds-centos-amd64"
container_engine: ${{ env.CONTAINER_CMD }}
- name: Fetch server ceph20-centos-amd64
uses: ishworkh/[email protected]
with:
image: "samba-server:ceph20-centos-amd64"
container_engine: ${{ env.CONTAINER_CMD }}
# (ad server images)
- name: Fetch ad-server default-fedora-amd64
uses: ishworkh/[email protected]
Expand Down Expand Up @@ -349,6 +360,7 @@ jobs:
-i samba-server:nightly-fedora-arm64
-i samba-server:nightly-centos-amd64
-i samba-server:devbuilds-centos-amd64
-i samba-server:ceph20-centos-amd64
-i samba-ad-server:default-fedora-amd64
-i samba-ad-server:default-fedora-arm64
-i samba-ad-server:default-opensuse-arm64
Expand All @@ -372,6 +384,7 @@ jobs:
-i ${REPO_BASE}/samba-server:nightly-fedora-amd64
-i ${REPO_BASE}/samba-server:nightly-centos-amd64
-i ${REPO_BASE}/samba-server:devbuilds-centos-amd64
-i ${REPO_BASE}/samba-server:ceph20-centos-amd64
-i ${REPO_BASE}/samba-ad-server:default-fedora-amd64
-i ${REPO_BASE}/samba-ad-server:default-fedora-arm64
-i ${REPO_BASE}/samba-ad-server:default-opensuse-arm64
Expand Down
4 changes: 3 additions & 1 deletion hack/build-image
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@ DEFAULT = "default"
NIGHTLY = "nightly"
DEVBUILDS = "devbuilds"
CUSTOM = "custom"
PACKAGE_SOURCES = [DEFAULT, NIGHTLY, DEVBUILDS, CUSTOM]
CEPH20 = "ceph20"
PACKAGE_SOURCES = [DEFAULT, NIGHTLY, DEVBUILDS, CUSTOM, CEPH20]

PACKAGES_FROM = {
DEFAULT: "",
NIGHTLY: "samba-nightly",
DEVBUILDS: "devbuilds",
CUSTOM: "custom-repos",
CEPH20: "ceph20",
}

# SOURCE_DIRS - image source paths
Expand Down
30 changes: 25 additions & 5 deletions images/server/install-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,26 @@ get_samba_nightly_repo() {

get_sig_samba_repo() {
if [[ "${OS_BASE}" = centos ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba
if [[ -z $1 ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba
else
dnf install --setopt=install_weak_deps=False -y \
centos-release-samba"${1//.}"
fi
fi
}

# shellcheck disable=SC2120
get_distro_ceph_repo() {
if [[ "${OS_BASE}" = centos ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph
if [[ -z $1 ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph
else
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph-"${1}"
fi
fi
}

Expand Down Expand Up @@ -148,6 +159,15 @@ case "${install_packages_from}" in
get_ceph_shaman_repo
package_selection=${package_selection:-custom-devbuilds}
;;
ceph20)
get_sig_samba_repo "4.22"
# Replace the following with 'get_distro_ceph_repo "tentacle"'
# once tentacle builds are out and remove the shellcheck waiver
# for get_distro_ceph_repo
CEPH_REPO_REF=tentacle
get_ceph_shaman_repo
package_selection=${package_selection:-stable}
;;
*)
get_sig_samba_repo
get_distro_ceph_repo
Expand Down Expand Up @@ -183,7 +203,7 @@ case "${package_selection}-${OS_BASE}" in
*-fedora|allvfs-*)
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
;;
*devbuilds-centos|forcedevbuilds-*)
*devbuilds-centos|forcedevbuilds-*|stable-*)
# Enable libcephfs proxy for dev builds
support_packages+=(libcephfs-proxy2)
# Fall through to next case
Expand Down
Loading