Fix patchComponent logic to find the correct python lib path && Zero the codebase

todor-ivanov commented 3 months ago

Status

ready

Description

This is a PR to add some more logic to bin/patchComponent.sh, such that we make it cover the new deployment models, both docker and virtual env. With this change during execution, the script makes an attempt to:

Find the proper pythonLib path independently of the deployment method or the deployment destination
Find the WMCore tag currently deployed at the host/container and zero the code base (only the list of files affected by the current patch) to the tag discovered. This way it avoids any eventual code conflicts during repeated patching or eventual leftovers from newly added files during the process of reverting and re applying the patch.

With the current PR we also increase the functionality of the script to be called by 3 methods:

Pointing just the PR number from upstream
```
./patchComponent.sh 11270
```
Creating and appling a patch directly from a current local source tree:
```
git diff --no-color | ./patchComponent.sh
```

Fetch a patch from upstream github (could be based only on a file diff or on a full PR) and apply it:

curl https://patch-diff.githubusercontent.com/raw/dmwm/WMCore/pull/11270.patch | ./patchComponent.sh

Is it backward compatible (if not, which system it affects?)

YES

Related PRs

None

External dependencies / deployment changes

None

cmsdmwmbot commented 3 months ago

Jenkins results:

Python3 Unit tests: succeeded
- 2 changes in unstable tests
Python3 Pylint check: succeeded
Pylint py3k check: succeeded
Pycodestyle check: succeeded

Details at https://cmssdt.cern.ch/dmwm-jenkins/view/All/job/DMWM-WMCore-PR-test/15157/artifact/artifacts/PullRequestReport.html

todor-ivanov commented 3 months ago

Hi @amaltaro As we discussed just before I leave for my vacation, here is the PR without an issue, just for pushing upstream the version of the patchComponent script I use for myslef, which proved itself to be quite functional and helps avoiding a lot of human errors and spares also significant operational effort during the process.

dmwm / WMCore