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] Preinstalled env pilot options in SiteDirector #7266

Merged
merged 2 commits into from
Nov 6, 2023

Conversation

atsareg
Copy link
Contributor

@atsareg atsareg commented Nov 1, 2023

PR to add preinstalledEnv and preinstalledEnvPrefix pilot options in the SiteDirector as defined in DIRACGrid/Pilot#205.

If both PreinstalledEnv and PreinstalledEnvPrefix pilot options are defined, the PreinstalledEnv option is preferred.

BEGINRELEASENOTES

*WorkloadManagement
NEW: SiteDirector - added preinstalledEnv and preinstalledEnvPrefix pilot options

ENDRELEASENOTES

@atsareg atsareg requested a review from fstagni as a code owner November 1, 2023 22:01
@DIRACGridBot DIRACGridBot added the alsoTargeting:integration Cherry pick this PR to integration after merge label Nov 1, 2023
@fstagni
Copy link
Contributor

fstagni commented Nov 2, 2023

I think that if one of the 2 options is set, the other should't.

@fstagni fstagni merged commit 1af9355 into DIRACGrid:rel-v8r0 Nov 6, 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 Nov 6, 2023
@DIRACGridBot
Copy link

Sweep summary

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

Failed:

  • integration
    cherry-pick 1af9355 into integration failed
    check merge conflicts on a local copy of this repository
    git fetch upstream
    git checkout upstream/integration -b cherry-pick-2-1af93550b-integration
    git cherry-pick -x -m 1 1af93550b
    # Fix the conflicts
    git cherry-pick --continue
    git commit --amend -m 'sweep: #7266 Preinstalled env pilot options in SiteDirector' --author='Andrei Tsaregorodtsev <[email protected]>'
    git push -u origin cherry-pick-2-1af93550b-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] Preinstalled env pilot options in SiteDirector' \
         --body 'Sweep #7266 `Preinstalled env pilot options in SiteDirector` to `integration`.
    
    Adding original author @atsareg as watcher.
    
    BEGINRELEASENOTES
    
    *WorkloadManagement
    NEW: SiteDirector - added preinstalledEnv and preinstalledEnvPrefix pilot options
    
    ENDRELEASENOTES
    Closes #7270'

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