Skip to content

[v7r0] Minor fixes + doc on Bdii#4520

Merged
atsareg merged 6 commits into
DIRACGrid:rel-v7r0from
fstagni:v7r0-fixes51
Apr 2, 2020
Merged

[v7r0] Minor fixes + doc on Bdii#4520
atsareg merged 6 commits into
DIRACGrid:rel-v7r0from
fstagni:v7r0-fixes51

Conversation

@fstagni

@fstagni fstagni commented Mar 31, 2020

Copy link
Copy Markdown
Contributor

BEGINRELEASENOTES

*RSS
FIX: correct verbosity (avoid non-necessary warnings)

*docs
NEW: Minimal documentation on Bdii2CSAgent and GOCDB2CSAgent

ENDRELEASENOTES

Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
Comment thread docs/source/AdministratorGuide/Resources/agents2CS.rst Outdated
single state
"""
def __str__( self ):

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some of these changes cause merge conflicts when getting merged to v7r1

Co-Authored-By: Andre Sailer <andre.philippe.sailer@cern.ch>
@andresailer

Copy link
Copy Markdown
Contributor

Please also add the ConfigTemplate include for these 2 agents.

@fstagni

fstagni commented Apr 2, 2020

Copy link
Copy Markdown
Contributor Author

Done. @andresailer did you have something else in mind?

@andresailer andresailer left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The Glue2 configuration is a bit of a mess:

If Glue2Only is false:

  1. Look at entries in Host for Glue1 information
  2. Look at entries in GLUE2URLs for Glue2 information

If Glue2Only is True:
Look at Host for Glue2 information

Comment thread ConfigurationSystem/ConfigTemplate.cfg Outdated
Comment thread ConfigurationSystem/ConfigTemplate.cfg Outdated
Co-Authored-By: Andre Sailer <andre.philippe.sailer@cern.ch>
@atsareg atsareg merged commit 445e331 into DIRACGrid:rel-v7r0 Apr 2, 2020
@chaen

chaen commented Apr 3, 2020

Copy link
Copy Markdown
Contributor

This was merged despite having failing integration tests. Was it on purpose ?

@fstagni

fstagni commented Apr 4, 2020

Copy link
Copy Markdown
Contributor Author

The reason why this was merged is because the only failing test is

Integration tests / Integration (5.7, cc7, No, Yes)

(https://github.com/DIRACGrid/DIRAC/pull/4520/checks?check_run_id=554903754)

which has nothing to do with the changes here (there's a failing ElasticSearch test -- seems like githubActions or docker failure).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants