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.

Sign up for GitHub

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

Jump to bottom

Add option to set xml output directory in OSG_autoconf. Fixes #318 #319

Merged
merged 3 commits into from
Aug 17, 2023
Merged

Add option to set xml output directory in OSG_autoconf. Fixes #318 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2b82dc
Add option to set xml output directory in OSG_autoconf. Fixes #318
mmascher Jul 6, 2023
8487be0
Add a few items to CHANGELOG
mmascher Aug 2, 2023
8b34670
Fixed CHANGELOG and pre-commit fixes
mambelli Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Changes since the last release
### New features / functionalities

- Added support for Debian 11 and Ubuntu 22 worker nodes (PR #320)
- Add option to set xml output directory in OSG_autoconf (PR #319)
- Allow OSG_autoconf to skip sites or CEs that are not present in the OSG collector (PR #315)

### Changed defaults / behaviours

Expand All @@ -27,7 +29,7 @@ Changes since the last release
- Fixing Python 3.9 deprecations (`imp`, `getchildren()` in `xml.etree.ElementTree`) (PR #302, PR #303)
- Populate missing Entry parameters for ARC CEs submissions (PR #304)
- Modified the usage of subprocess module, for building/rebuilding cvmfsexec distributions, only when necessary (PR #309)
- manual_glidein_submit now correctly sets idtokens in the EncryptedInputFiles (issue #283, PR#284)
- manual_glidein_submit now correctly sets idtokens in the EncryptedInputFiles (issue #283, PR #284)

### Testing / Development

Expand Down
5 changes: 4 additions & 1 deletion factory/tools/OSG_autoconf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ def create_missing_file_internal(missing_info, osg_info, whitelist_info, osg_col
def main(args):
"""The main"""
config = get_yaml_file_info(args.config[0])
xmloutdir = config.get("XML_OUTDIR", None)
try:
# Queries the OSG collector
result = get_information(config["OSG_COLLECTOR"])
Expand All @@ -657,7 +658,9 @@ def main(args):
# Convert the resoruce dictionary obtained this way into a string (xml)
entries_configuration = get_entries_configuration(result)
# Write the factory configuration file on the disk
write_to_xml_file(white_list.replace("yml", "xml"), entries_configuration)
xmloutdir = os.path.dirname(white_list) if xmloutdir == None else xmloutdir
filename = os.path.basename(white_list.replace("yml", "xml"))
write_to_xml_file(os.path.join(xmloutdir, filename), entries_configuration)


if __name__ == "__main__":
Expand Down
Loading