Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0] fix: getting batch system info from local cfg #7289

Merged

Conversation

aldbr
Copy link
Contributor

@aldbr aldbr commented Nov 10, 2023

Aims at solving #7177
Associated with DIRACGrid/Pilot#222

BEGINRELEASENOTES
*Resources
FIX: get batch system details from local cfg instead of environment variables
ENDRELEASENOTES

@DIRACGridBot DIRACGridBot added the alsoTargeting:integration Cherry pick this PR to integration after merge label Nov 10, 2023
@aldbr aldbr force-pushed the v8.0_FIX_BatchSystemInfoFromApptainer branch 2 times, most recently from 39e1017 to d17a3de Compare November 13, 2023 09:40
@aldbr aldbr force-pushed the v8.0_FIX_BatchSystemInfoFromApptainer branch 3 times, most recently from 39ff9b3 to 9aa08e3 Compare November 20, 2023 12:35
@aldbr aldbr force-pushed the v8.0_FIX_BatchSystemInfoFromApptainer branch 2 times, most recently from 47b9b41 to 1b00fd0 Compare November 23, 2023 11:44
@fstagni
Copy link
Contributor

fstagni commented Nov 24, 2023

Just to be sure: this works also without DIRACGrid/Pilot#222 right? (in the sense that it does not crash)

@aldbr
Copy link
Contributor Author

aldbr commented Dec 7, 2023

Just to be sure: this works also without DIRACGrid/Pilot#222 right? (in the sense that it does not crash)

Now it should work without DIRACGrid/Pilot#222.

@aldbr aldbr force-pushed the v8.0_FIX_BatchSystemInfoFromApptainer branch from cb10fea to 2ffe69a Compare December 7, 2023 18:13
@aldbr aldbr force-pushed the v8.0_FIX_BatchSystemInfoFromApptainer branch from 2ffe69a to db93b46 Compare December 7, 2023 18:27
@aldbr aldbr requested a review from fstagni December 8, 2023 09:36
@fstagni fstagni merged commit 460fa7a into DIRACGrid:rel-v8r0 Dec 8, 2023
25 checks passed
@DIRACGridBot DIRACGridBot added sweep:done All sweeping actions have been done for this PR sweep:failed Sweeping failed and needs manual intervention labels Dec 8, 2023
@DIRACGridBot
Copy link

Sweep summary

Sweep ran in https://github.com/DIRACGrid/DIRAC/actions/runs/7139908581

Failed:

  • integration
    cherry-pick 460fa7a into integration failed
    check merge conflicts on a local copy of this repository
    git fetch upstream
    git checkout upstream/integration -b cherry-pick-2-460fa7ad1-integration
    git cherry-pick -x -m 1 460fa7ad1
    # Fix the conflicts
    git cherry-pick --continue
    git commit --amend -m 'sweep: #7289 fix: getting batch system info from local cfg' --author='aldbr <[email protected]>'
    git push -u origin cherry-pick-2-460fa7ad1-integration
    
    # If you have the GitHub CLI installed the PR can be made with
    gh pr create \
         --label 'sweep:from rel-v8r0' \
         --base integration \
         --repo DIRACGrid/DIRAC \
         --title '[sweep:integration] fix: getting batch system info from local cfg' \
         --body 'Sweep #7289 `fix: getting batch system info from local cfg` to `integration`.
    
    Adding original author @aldbr as watcher.
    
    BEGINRELEASENOTES
    *Resources
    FIX: get batch system details from local cfg instead of environment variables
    ENDRELEASENOTES
    Closes #7355'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
alsoTargeting:integration Cherry pick this PR to integration after merge sweep:done All sweeping actions have been done for this PR sweep:failed Sweeping failed and needs manual intervention
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants