Skip to content

merge queue: embarking devel (cba25cb) and #5962 together #5970

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
Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking devel (cba25cb) and #5962 together #5970

mergify wants to merge 2 commits into from
+1 −10

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 23, 2026 •
edited
Loading

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch devel (cba25cb) and #5962 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #5962.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • any of:
    • all of:
      • base=devel
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
      • any of:
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
        • label=ci/skip/e2e
    • all of:
      • base~=^(release-.+)$
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
      • any of:
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/k8s-e2e-external-storage/1.34
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.34
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.34
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
        • label=ci/skip/e2e
    • all of:
      • base=release-v3.15
      • any of:
        • label=ci/skip/e2e
        • all of:
          • status-success=ci/centos/k8s-e2e-external-storage/1.31
          • status-success=ci/centos/mini-e2e-helm/k8s-1.31
          • status-success=ci/centos/mini-e2e/k8s-1.31
          • status-success=ci/centos/k8s-e2e-external-storage/1.32
          • status-success=ci/centos/k8s-e2e-external-storage/1.33
          • status-success=ci/centos/mini-e2e-helm/k8s-1.32
          • status-success=ci/centos/mini-e2e-helm/k8s-1.33
          • status-success=ci/centos/mini-e2e/k8s-1.32
          • status-success=ci/centos/mini-e2e/k8s-1.33
          • status-success=ci/centos/upgrade-tests-cephfs
          • status-success=ci/centos/upgrade-tests-rbd
      • status-success=codespell
      • status-success=go-test
      • status-success=golangci-lint
      • status-success=lint-extras
      • status-success=mod-check
      • status-success=multi-arch-build
      • status-success=uncommitted-code-check
    • all of:
      • base=ci/centos
      • status-success=ci/centos/jjb-validate
      • status-success=ci/centos/job-validation

Required conditions to stay in the queue:

---
checking_base_sha: cba25cb61bd790f84e6dee050c53e9109f9b225f
previous_failed_batches: []
pull_requests:
  - number: 5962
...

Nikhil-Ladha and others added 2 commits January 22, 2026 17:13
@Nikhil-Ladha
Revert "rbd: fetch the volumeIds from VGRContent's status for omap data"
2cd7076 
This reverts commit e62e083.
The commit needs to be reverted as on further testing it was
found that fetching the omap data from status could mean that
we would trigger a modify operation during promotion of a
group which could lead to inconsistency.

Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>
@mergify
Merge of #5962
d86fc8b
@ceph-csi-bot ceph-csi-bot added bug Something isn't working component/rbd Issues related to RBD queued dequeued backport-to-release-v3.16 ok-to-test Label to trigger E2E tests labels Jan 23, 2026
@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/k8s-e2e-external-storage/1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e-helm/k8s-1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/k8s-e2e-external-storage/1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/k8s-e2e-external-storage/1.34

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e/k8s-1.32

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e-helm/k8s-1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e-helm/k8s-1.34

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e/k8s-1.33

@ceph-csi-bot
Copy link
Collaborator

ceph-csi-bot commented Jan 23, 2026

/test ci/centos/mini-e2e/k8s-1.34

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Jan 23, 2026
@mergify mergify bot mentioned this pull request Jan 23, 2026
Merged
@mergify mergify bot closed this Jan 23, 2026
@mergify mergify bot deleted the mergify/merge-queue/236f008187 branch January 23, 2026 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

backport-to-release-v3.16 bug Something isn't working component/rbd Issues related to RBD dequeued queued

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ceph-csi-bot @Nikhil-Ladha