Skip to content

containers: Dynamically determine OS variant and version#1245

Merged
mergify[bot] merged 3 commits into
ceph:masterfrom
anoopcs9:fix-ci-image-el10-build
Mar 27, 2026
Merged

containers: Dynamically determine OS variant and version#1245
mergify[bot] merged 3 commits into
ceph:masterfrom
anoopcs9:fix-ci-image-el10-build

Conversation

@anoopcs9

@anoopcs9 anoopcs9 commented Mar 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Ceph now builds development containers for the main branch on Rocky Linux 10 instead of CentOS Stream 9. Update the shaman url parameters and the distribution tag for the ceph‑release package to dynamically determine the variant and version of the underlying OS.

fixes #1244

@anoopcs9 anoopcs9 force-pushed the fix-ci-image-el10-build branch from 108daf9 to 3695f59 Compare March 26, 2026 10:01
@anoopcs9 anoopcs9 changed the title Dockerfile: Use el10 variant for ceph devel containers Dockerfile: Dynamically determine OS variant and version Mar 26, 2026
@anoopcs9 anoopcs9 force-pushed the fix-ci-image-el10-build branch from 3695f59 to 4e10c72 Compare March 26, 2026 10:05
@anoopcs9

anoopcs9 commented Mar 26, 2026

Copy link
Copy Markdown
Collaborator Author

#6 0.786 Extra Packages for Enterprise Linux 10 - x86_64 11 MB/s | 5.6 MB 00:00
#6 3.940 Rocky Linux 10 - BaseOS 6.9 MB/s | 14 MB 00:02
#6 7.278 Rocky Linux 10 - AppStream 1.2 MB/s | 2.3 MB 00:01
#6 8.097 Rocky Linux 10 - Extras 12 kB/s | 6.0 kB 00:00
#6 8.149 Can not load RPM file: /noarch/ceph-release-1-0.el10.1 (Red Quartz).noarch.rpm.
#6 8.665 Error: No packages marked for reinstall.
#6 9.262 Extra Packages for Enterprise Linux 10 - x86_64 38 MB/s | 16 MB 00:00
#6 13.05 Rocky Linux 10 - BaseOS 7.9 MB/s | 16 MB 00:01
#6 15.02 Rocky Linux 10 - AppStream 7.0 MB/s | 12 MB 00:01
#6 17.24 Rocky Linux 10 - Extras 12 kB/s | 9.7 kB 00:00
#6 17.34 Package curl-8.12.1-2.el10_1.2.x86_64 is already installed.
#6 17.34 Package make-1:4.4.1-9.el10.x86_64 is already installed.
#6 17.34 Package gcc-14.3.1-2.1.el10.x86_64 is already installed.
#6 17.35 No match for argument: libcephfs-devel
#6 17.36 No match for argument: librados-devel
#6 17.36 No match for argument: librbd-devel
#6 17.37 No match for argument: libradosstriper-devel
#6 17.37 No match for argument: libcephfs2-debuginfo
#6 17.38 No match for argument: librados2-debuginfo
#6 17.38 No match for argument: librbd1-debuginfo
#6 17.39 No match for argument: libradosstriper1-debuginfo

OK.

@anoopcs9 anoopcs9 force-pushed the fix-ci-image-el10-build branch from 4e10c72 to e9d3e2b Compare March 26, 2026 17:19
@anoopcs9 anoopcs9 marked this pull request as ready for review March 26, 2026 17:21
@anoopcs9 anoopcs9 added the no-API This PR does not include any changes to the public API of a go-ceph package label Mar 26, 2026
@anoopcs9 anoopcs9 requested a review from phlogistonjohn March 26, 2026 17:22
@phlogistonjohn

phlogistonjohn commented Mar 26, 2026

Copy link
Copy Markdown
Collaborator

is it time to move this code to an actual shell script?

@anoopcs9

anoopcs9 commented Mar 27, 2026

Copy link
Copy Markdown
Collaborator Author

is it time to move this code to an actual shell script?

Let me try once.

@anoopcs9 anoopcs9 force-pushed the fix-ci-image-el10-build branch from e9d3e2b to 4eb9f85 Compare March 27, 2026 10:30
@anoopcs9 anoopcs9 changed the title Dockerfile: Dynamically determine OS variant and version containers: Dynamically determine OS variant and version Mar 27, 2026
anoopcs9 added 3 commits March 27, 2026 16:15
@anoopcs9
Makefile: Use Dockerfile directory as additional build context
5fff5d9 
This commit adds the Dockerfile's directory as an additional build
context instead of relying solely on the current working directory.
This change prepares the repository for any future helper scripts
that will be executed during the build process.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
@anoopcs9
Dockerfile: Factor out shell scripting steps
3cfafcd 
Create separate shell script files for readability and reduced
error‑proneness. Copy and execute them during the build.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
@anoopcs9
containers: Dynamically determine OS variant and version
435b405 
Ceph now builds development containers for the main branch on Rocky
Linux 10 instead of CentOS Stream 9. Update the shaman url parameters
and the distribution tag for the ceph‑release package to dynamically
determine the variant and version of the underlying OS.

Signed-off-by: Anoop C S <anoopcs@cryptolab.net>
@anoopcs9 anoopcs9 force-pushed the fix-ci-image-el10-build branch from 4eb9f85 to 435b405 Compare March 27, 2026 10:53
@anoopcs9

anoopcs9 commented Mar 27, 2026

Copy link
Copy Markdown
Collaborator Author

@phlogistonjohn Should we also take this as an opportunity to consider relocating entrypoint.sh and micro‑osd.sh?

@phlogistonjohn

phlogistonjohn commented Mar 27, 2026

Copy link
Copy Markdown
Collaborator

Should we also take this as an opportunity to consider relocating entrypoint.sh and micro‑osd.sh?

Sure, but probably for a later PR. :-)

@mergify mergify Bot added the queued label Mar 27, 2026
@mergify mergify Bot merged commit c4b320c into ceph:master Mar 27, 2026
15 of 16 checks passed
@mergify

mergify Bot commented Mar 27, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • ✅ Entered queue — 2026-03-27 14:26 UTC · Rule: default
  • ✅ Checks skipped · PR is already up-to-date
  • ✅ Merged — 2026-03-27 14:26 UTC · at 435b405a7b52d6ae43ddeef5fab1fcf9ba16f325

This pull request spent 15 seconds in the queue, with no time running CI.

Required conditions to merge
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = check
    • check-neutral = check
    • check-skipped = check
  • any of [🛡 GitHub branch protection]:
    • check-success = test-suite (pacific)
    • check-neutral = test-suite (pacific)
    • check-skipped = test-suite (pacific)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-suite (quincy)
    • check-neutral = test-suite (quincy)
    • check-skipped = test-suite (quincy)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-suite (reef)
    • check-neutral = test-suite (reef)
    • check-skipped = test-suite (reef)
  • any of [🛡 GitHub branch protection]:
    • check-success = test-suite (squid)
    • check-neutral = test-suite (squid)
    • check-skipped = test-suite (squid)

@mergify mergify Bot removed the queued label Mar 27, 2026
@anoopcs9 anoopcs9 deleted the fix-ci-image-el10-build branch March 30, 2026 07:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@phlogistonjohn phlogistonjohn phlogistonjohn approved these changes

Assignees

No one assigned

Labels

no-API This PR does not include any changes to the public API of a go-ceph package

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CI jobs are failing against Ceph main

2 participants

@anoopcs9 @phlogistonjohn