search

xapi-project / xen-api

The Xapi Project's XenAPI Server
http://xenproject.org/developers/teams/xapi.html
Other
344 stars 283 forks source link

Merge `master` into `feature/py3` to fix OCaml CI failures using #5726 #5733

Closed bernhardkaindl closed 3 weeks ago

bernhardkaindl commented 3 weeks ago

In https://github.com/xapi-project/xen-api/pull/5731#issuecomment-2189273929, @psafont wrote:

The ocaml failure is fixed with https://github.com/xapi-project/xen-api/pull/5726 Longer term a merge from master is needed

That's great!

This PR is:

I repeated it a 2nd (and a 3rd) time and compared those to the PR/merge branch (see comments).

@stephenchengCloud

PS: Initially, I forgot to select feature/py3 in the GUI when opening the PR: Is corrected. The list of commits was always correct and GitHub is displaying the correct commits now. A reference PR in my test repo that shows the same commits is here: https://github.com/xenserver-next/xen-api/pull/25

codecov[bot] commented 3 weeks ago

Codecov Report

Attention: Patch coverage is 92.78810% with 97 lines in your changes missing coverage. Please review.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## master #5733 +/- ## ========================================= + Coverage 45.5% 76.1% +30.6% ========================================= Files 13 24 +11 Lines 1624 3207 +1583 ========================================= + Hits 739 2442 +1703 + Misses 885 765 -120 ``` | [Files](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?dropdown=coverage&src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | Coverage Δ | | |---|---|---| | [python3/libexec/usb\_reset.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Flibexec%2Fusb_reset.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy9saWJleGVjL3VzYl9yZXNldC5weQ==) | `16.9% <100.0%> (ø)` | | | [python3/packages/observer.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Fpackages%2Fobserver.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy9wYWNrYWdlcy9vYnNlcnZlci5weQ==) | `74.8% <100.0%> (ø)` | | | [python3/tests/conftest.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fconftest.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9jb25mdGVzdC5weQ==) | `100.0% <100.0%> (ø)` | | | [python3/tests/import\_helper.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fimport_helper.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9pbXBvcnRfaGVscGVyLnB5) | `100.0% <100.0%> (ø)` | | | [python3/tests/observer/\_\_init\_\_.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fobserver%2F__init__.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9vYnNlcnZlci9fX2luaXRfXy5weQ==) | `100.0% <100.0%> (ø)` | | | [python3/tests/observer/it\_handles\_errors.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fobserver%2Fit_handles_errors.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9vYnNlcnZlci9pdF9oYW5kbGVzX2Vycm9ycy5weQ==) | `100.0% <100.0%> (ø)` | | | [python3/tests/observer/it\_traces.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fobserver%2Fit_traces.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9vYnNlcnZlci9pdF90cmFjZXMucHk=) | `100.0% <100.0%> (ø)` | | | [python3/tests/observer/traced\_script.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Fobserver%2Ftraced_script.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy9vYnNlcnZlci90cmFjZWRfc2NyaXB0LnB5) | `100.0% <100.0%> (ø)` | | | [python3/tests/test\_hfx\_filename.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Ftest_hfx_filename.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy90ZXN0X2hmeF9maWxlbmFtZS5weQ==) | `100.0% <100.0%> (ø)` | | | [python3/tests/test\_nbd\_client\_manager.py](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree&filepath=python3%2Ftests%2Ftest_nbd_client_manager.py&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#diff-cHl0aG9uMy90ZXN0cy90ZXN0X25iZF9jbGllbnRfbWFuYWdlci5weQ==) | `100.0% <100.0%> (ø)` | | | ... and [9 more](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | | ... and [9 files with indirect coverage changes](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | [Flag](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | Coverage Δ | | |---|---|---| | [python2.7](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | `?` | | | [python3.11](https://app.codecov.io/gh/xapi-project/xen-api/pull/5733/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project) | `76.1% <92.7%> (?)` | | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=xapi-project#carryforward-flags-in-the-pull-request-comment) to find out more.
Vincent-lau commented 3 weeks ago

emm, am I confused, why is this merging into master?

bernhardkaindl commented 3 weeks ago

Thanks! Fixed the target branch to feature/py3.

bernhardkaindl commented 3 weeks ago

I did the merge again and compared it with the PR/merge branch - it should be ok:

# fetch latest git:
git remote -v|grep origin
origin  git@github.com:xapi-project/xen-api.git (fetch)
origin  git@github.com:xapi-project/xen-api.git (push)
git fetch origin
git checkout feature/py3
git pull
Already up to date.

# merge:
git checkout -b merge-master-to-py3-to-fix-ci-using-5726-$USER feature/py3
git merge origin/master
# To sign-off the merge commit:
git commit -s --amend

# Compare to pushed PR:
git remote add xenserver-next git@github.com:xenserver-next/xen-api.git
git fetch xenserver-next
git diff xenserver-next/merge-master-to-py3-to-fix-ocaml-ci-pr-5726
(no diff)
psafont commented 3 weeks ago

The latest master has another fix in the tests, it's worth dropping this merge and creating a new one

bernhardkaindl commented 3 weeks ago

Pau wrote:

The latest master has another fix in the tests, it's worth dropping this merge and creating a new one

Edwin wrote:

might need to merge another CI fix from master

Thanks, because this PR now already has 4 approvals, I tend to like to merge it and open a new PR only for the remaining commits to be merged later.