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: get setup from gConfig in ComponentSupervisionAgent #7236

Merged

Conversation

aldbr
Copy link
Contributor

@aldbr aldbr commented Oct 11, 2023

Solves #7235
Not entirely sure that this is the right fix.

BEGINRELEASENOTES
*Framework
CHANGE: ComponentSupervisionAgent: use gConfig to get the setup from /DIRAC/Setup
CHANGE: ComponentSupervisionAgent remove Setup option
ENDRELEASENOTES

@aldbr aldbr requested a review from fstagni October 11, 2023 07:34
@aldbr aldbr linked an issue Oct 11, 2023 that may be closed by this pull request
@DIRACGridBot DIRACGridBot added the alsoTargeting:integration Cherry pick this PR to integration after merge label Oct 11, 2023
@fstagni fstagni requested a review from andresailer October 11, 2023 09:18
Copy link
Contributor

@andresailer andresailer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • The Setup option has to be removed from the ConfigTemplate, this also makes the test fail now.
  • Please note in the Release Notes that the option was removed.

@aldbr aldbr force-pushed the v8.0_FIX_ComponentSupervisionAgent branch from 2f50a4f to 1e59b2f Compare October 11, 2023 14:44
@fstagni fstagni merged commit f741dcc into DIRACGrid:rel-v8r0 Oct 11, 2023
20 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 Oct 11, 2023
@DIRACGridBot
Copy link

Sweep summary

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

Failed:

  • integration
    cherry-pick f741dcc into integration failed
    check merge conflicts on a local copy of this repository
    git fetch upstream
    git checkout upstream/integration -b cherry-pick-2-f741dccf2-integration
    git cherry-pick -x -m 1 f741dccf2
    # Fix the conflicts
    git cherry-pick --continue
    git commit --amend -m 'sweep: #7236 fix: get setup from gConfig in ComponentSupervisionAgent' --author='aldbr <[email protected]>'
    git push -u origin cherry-pick-2-f741dccf2-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: get setup from gConfig in ComponentSupervisionAgent' \
         --body 'Sweep #7236 `fix: get setup from gConfig in ComponentSupervisionAgent` to `integration`.
    
    Adding original author @aldbr as watcher.
    
    BEGINRELEASENOTES
    *Framework
    FIX: use gConfig to get the setup in ComponentSupervisionAgent
    ENDRELEASENOTES
    Closes #7240'

fstagni added a commit to fstagni/DIRAC that referenced this pull request Oct 11, 2023
…isionAgent

[8.0] fix: get setup from gConfig in ComponentSupervisionAgent

(cherry picked from commit f741dcc)
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.

Missing setup in Framework/ComponentSupervisionAgent
4 participants