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

[bernhardkaindl]

In #5731 (comment), @psafont wrote:

The ocaml failure is fixed with #5726 Longer term a merge from master is needed

That's great!

This PR is:

• A simple git merge master into feature/py3.
• No conflicts occurred, it was just the merge command (and update of the branches before).

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: xenserver-next#25

[codecov]

Codecov Report

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

Additional details and impacted files

@@            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	Coverage Δ
python3/libexec/usb_reset.py	16.9% <100.0%> (ø)
python3/packages/observer.py	74.8% <100.0%> (ø)
python3/tests/conftest.py	100.0% <100.0%> (ø)
python3/tests/import_helper.py	100.0% <100.0%> (ø)
python3/tests/observer/__init__.py	100.0% <100.0%> (ø)
python3/tests/observer/it_handles_errors.py	100.0% <100.0%> (ø)
python3/tests/observer/it_traces.py	100.0% <100.0%> (ø)
python3/tests/observer/traced_script.py	100.0% <100.0%> (ø)
python3/tests/test_hfx_filename.py	100.0% <100.0%> (ø)
python3/tests/test_nbd_client_manager.py	100.0% <100.0%> (ø)
... and 9 more

... and 9 files with indirect coverage changes

Flag	Coverage Δ
python2.7	?
python3.11	76.1% <92.7%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

[Vincent-lau]

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

[edwintorok]

Wrong target branch

[bernhardkaindl]

Thanks! Fixed the target branch to feature/py3.

[bernhardkaindl]

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]

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

[edwintorok]

target branch looks fine, probably best to cherry pick the latest bugfix from master (or recreate the merge)

might need to merge another CI fix from master

[bernhardkaindl]

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.