Skip to content
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

ci: update PR-commenter and Mergify for Kubernertes 1.26/1.30 (backport #4589) #4616

Merged
merged 4 commits into from
May 16, 2024
Merged

ci: update PR-commenter and Mergify for Kubernertes 1.26/1.30 (backport #4589) #4616

merged 4 commits into from
May 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 15, 2024

The k8s-external-storage/1.26 CI job does not work with the versions
that are part of the release-v3.11 and devel branches.

Run CI jobs with Kubernetes 1.30 for the devel branch and upcoming
releases.

Related-to: #4569

This is an automatic backport of pull request #4589 done by [Mergify](https://mergify.com).

nixpanic added 3 commits May 15, 2024 05:54
@nixpanic @mergify
ci: do not run k8s-1.26 tests for release-v3.11 and devel
3361186 
The k8s-external-storage/1.26 CI job does not work with the versions
that are part of the release-v3.11 and devel branches.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit 6009c28)
@nixpanic @mergify
ci: trigger k8s-1.30 jobs for current Ceph-CSI versions
ca82803 
Run CI jobs with Kubernetes 1.30 for the devel branch and upcoming
releases.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit c558588)
@nixpanic @mergify
ci: do not require k8s-1.26 jobs for release-v3.11
f2baf71 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit 3d3c0aa)
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 15, 2024

Cherry-pick of 5357999 has failed:

On branch mergify/bp/release-v3.11/pr-4589
Your branch is ahead of 'origin/release-v3.11' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 53579991e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .mergify.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added conflicts component/testing Additional test cases or CI work ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures Repo activity Process/activites on ceph-csi repo labels May 15, 2024
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

@iPraveenParihar can you please fix the merge conflicts? Thank you

@iPraveenParihar iPraveenParihar force-pushed the mergify/bp/release-v3.11/pr-4589 branch from 0ac75d5 to da89d50 Compare May 15, 2024 06:42
Madhu-1
Madhu-1 reviewed May 15, 2024
View reviewed changes
.mergify.yml Outdated Show resolved Hide resolved
@nixpanic @iPraveenParihar
ci: require k8s-1.30 CI jobs for release-v3.11 and devel branches
ae14dd0 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
(cherry picked from commit 5357999)
@iPraveenParihar iPraveenParihar force-pushed the mergify/bp/release-v3.11/pr-4589 branch from da89d50 to ae14dd0 Compare May 15, 2024 07:21
@Madhu-1 Madhu-1 added ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only) and removed conflicts labels May 15, 2024
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

@Mergifyio queue

@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 15, 2024 •
edited
Loading

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 4c7d419

@mergify mergify bot added the ok-to-test Label to trigger E2E tests label May 15, 2024
mergify bot added a commit that referenced this pull request May 15, 2024
@mergify
Merge of #4616
7f25be9
@mergify mergify bot mentioned this pull request May 15, 2024
Closed
72 tasks
@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label May 15, 2024
@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

/test i/centos/k8s-e2e-external-storage/1.30

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Madhu-1
Copy link
Collaborator

Madhu-1 commented May 15, 2024

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

@Rakshith-R
Copy link
Contributor

@Mergifyio refresh

@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 16, 2024

refresh

✅ Pull request refreshed

@Rakshith-R
Copy link
Contributor

@Mergifyio refresh

@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 16, 2024

refresh

✅ Pull request refreshed

@mergify mergify bot merged commit 4c7d419 into release-v3.11 May 16, 2024
46 checks passed
@mergify mergify bot deleted the mergify/bp/release-v3.11/pr-4589 branch May 16, 2024 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iPraveenParihar iPraveenParihar iPraveenParihar left review comments

@Rakshith-R Rakshith-R Rakshith-R approved these changes

@Madhu-1 Madhu-1 Madhu-1 approved these changes

Assignees
No one assigned
Labels
ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures component/testing Additional test cases or CI work ready-to-merge This PR is ready to be merged and it doesn't need second review (backports only) Repo activity Process/activites on ceph-csi repo
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Madhu-1 @ceph-csi-bot @Rakshith-R @iPraveenParihar @nixpanic