CP-49906 :CI: Merge pytest & Coveralls (1/2 of simplifying merges with master) #5774
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Patch 1/2 for easier merges of `.github/workflows/other.yml` with master: 1. Merge the pytest and use of Coveralls from `master` into `feature/py3`. 2. Unblock moving of the remaining tests to `python3/tests`: Merge the removal of `--cov-fail-under 45` from master into the Python3. It unblocks moving `scripts/plugins/test_extauth_hook_AD.py` to `python3`. Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
|
I think it's worth merging from master instead of adding commits and deal with conflicts after the fact |
A:Thank you for the feedback , this PR would help us in moving forward ,extauth-hook-AD.py fails for 2.7 ,removing the requirement of 45% coverage will be helpful. https://github.com/ashwin9390/xen-api/actions/runs/9758441405 ,need to find a way to fix 3.11 errors. |
bernhardkaindl
added a commit
to xenserver-next/xen-api
that referenced
this pull request
Jul 4, 2024
Conflict in .github/workflows/other.yml resolved like in xapi-project#5774
bernhardkaindl
added a commit
to xenserver-next/xen-api
that referenced
this pull request
Jul 4, 2024
Conflict in .github/workflows/other.yml resolved like in xapi-project#5774 Signed-off-by: Bernhard Kaindl <bernhard.kaindl@cloud.com>
|
Thanks! There is no problem to merge from master and use the same .github/workflows/other.yml as basis to resolve the conflict. This is opened in #5776 now, and as it supersedes this PR, I'm closing it as obsolete. |
bernhardkaindl
deleted the
CI-merge-master-coveralls-simplify-future-merges
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Main ticket CP-49100 :Move python3 scripts from scripts directory to python3 directory.
Sub task CP-49906:
Patch 1/2 for easier merges of
.github/workflows/other.ymlwith master:masterintofeature/py3.python3/tests:Merge the removal of
--cov-fail-under 45from master into the Python3. It unblocks movingscripts/plugins/test_extauth_hook_AD.pytopython3.Author: Signed-off-by: Bernhard Kaindl bernhard.kaindl@cloud.com
Committed by: Signed-off-by: Ashwinh ashwin.h@cloud.com