ci: update ubuntu image to 22.04 (backport #14166)

mergify[bot] commented 1 month ago

updating ubuntu image to 22.04 from 20.04 which is used in ci test

Checklist:

[ ] Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
[ ] Reviewed the developer guide on Submitting a Pull Request
[ ] Pending release notes updated with breaking and/or notable changes for the next minor release.
[ ] Documentation has been updated, if necessary.
[ ] Unit tests have been added, if necessary.
[ ] Integration tests have been added, if necessary.
This is an automatic backport of pull request #14166 done by Mergify.

mergify[bot] commented 1 month ago

Cherry-pick of 11ce20feaf21c4c1d99038f82c2b9f6694f97d78 has failed:

On branch mergify/bp/release-1.14/pr-14166
Your branch is up to date with 'origin/release-1.14'.

You are currently cherry-picking commit 11ce20fea.
  (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)

Changes to be committed:
    modified:   .github/workflows/build.yml
    modified:   .github/workflows/canary-integration-test.yml
    modified:   .github/workflows/codegen.yml
    modified:   .github/workflows/commitlint.yml
    modified:   .github/workflows/crds-gen.yml
    modified:   .github/workflows/create-tag.yaml
    modified:   .github/workflows/daily-nightly-jobs.yml
    modified:   .github/workflows/docs-check.yml
    modified:   .github/workflows/integration-test-helm-suite.yaml
    modified:   .github/workflows/integration-test-mgr-suite.yaml
    modified:   .github/workflows/integration-test-multi-cluster-suite.yaml
    modified:   .github/workflows/integration-test-object-suite.yaml
    modified:   .github/workflows/integration-test-smoke-suite.yaml
    modified:   .github/workflows/integration-test-upgrade-suite.yaml
    modified:   .github/workflows/integration-tests-on-release.yaml
    modified:   .github/workflows/mod-check.yml
    modified:   .github/workflows/push-build.yaml
    modified:   .github/workflows/rbac-gen.yaml
    modified:   .github/workflows/stale.yaml
    modified:   .github/workflows/unit-test.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/codespell.yaml

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

BlaineEXE commented 1 month ago

Looks like there is a PR that changes codespell CI that needs to be backported: https://github.com/rook/rook/pull/14038 BP: https://github.com/rook/rook/pull/14172

We can rebase this after the bp merges.

BlaineEXE commented 1 month ago

@mergify rebase

(hoping this works)

mergify[bot] commented 1 month ago

rebase

☑️ Nothing to do

- [ ] `-conflict` [📌 rebase requirement] - [X] `-closed` [📌 rebase requirement] - [X] `queue-position=-1` [📌 rebase requirement] - [X] any of: - [X] `#commits-behind>0` [📌 rebase requirement] - [ ] `#commits>1` [📌 rebase requirement] - [ ] `-linear-history` [📌 rebase requirement]

mergify[bot] commented 1 month ago

This pull request has merge conflicts that must be resolved before it can be merged. @mergify[bot] please rebase it. https://rook.io/docs/rook/latest/Contributing/development-flow/#updating-your-fork

BlaineEXE commented 1 month ago

@subhamkrai will have to manually rebase since mergify is apparently useless at this

subhamkrai commented 1 month ago

@mergify rebase

mergify[bot] commented 1 month ago

rebase

☑️ Nothing to do

- [ ] `-conflict` [📌 rebase requirement] - [X] `-closed` [📌 rebase requirement] - [X] `queue-position=-1` [📌 rebase requirement] - [X] any of: - [X] `#commits-behind>0` [📌 rebase requirement] - [ ] `#commits>1` [📌 rebase requirement] - [ ] `-linear-history` [📌 rebase requirement]

subhamkrai commented 1 month ago

@mergify rebase

mergify[bot] commented 1 month ago

rebase

☑️ Nothing to do

- [ ] `-conflict` [📌 rebase requirement] - [X] `-closed` [📌 rebase requirement] - [X] `queue-position=-1` [📌 rebase requirement] - [X] any of: - [X] `#commits-behind>0` [📌 rebase requirement] - [ ] `#commits>1` [📌 rebase requirement] - [ ] `-linear-history` [📌 rebase requirement]

subhamkrai commented 1 month ago

@subhamkrai will have to manually rebase since mergify is apparently useless at this

done

rook / rook