From 5cdc542861b24dd9acd70039804fc4d5c7a14896 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Thu, 2 Oct 2025 17:13:54 -0500 Subject: [PATCH 1/5] Add CHTC and UChicago Software Repo instances --- .../UChicago/UChicago_OSGConnect.yaml | 40 +++++++++++++++++++ .../CHTC/CHTC.yaml" | 39 ++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml b/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml index 8ac6fed3ca..72b0c6db5c 100644 --- a/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml +++ b/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml @@ -601,3 +601,43 @@ Resources: Description: OSG Connect Project Origin Server AllowedVOs: - OSG + + UChicago-OSG-repo: + Active: true + Description: The UChicago instance of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000016 + Name: Judith Stephen + Secondary: + ID: OSG1000765 + Name: David Jordan + Tertiary: + ID: OSG1000221 + Name: Farnaz Golnaraghi + Security Contact: + Primary: + ID: OSG1000016 + Name: Judith Stephen + Secondary: + ID: OSG1000765 + Name: David Jordan + Tertiary: + ID: OSG1000221 + Name: Farnaz Golnaraghi + FQDN: repo.osg-htc.org + FQDNAliases: + - repo.opensciencegrid.org + - repo.osgprod.tempest.chtc.io + - repo-rsync.osg-htc.org + - repo-rsync.opensciencegrid.org + - repo-rsync.osgprod.tempest.chtc.io + Services: + Software Repo: + Description: OSG Yum Repositories + Tags: + - OSPool + VOOwnership: + OSG: 100 + diff --git "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" index 1d696f5678..bb7c37b4b2 100644 --- "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" +++ "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" @@ -1054,3 +1054,42 @@ Resources: - OSPool VOOwnership: OSG: 100 + + CHTC-OSG-repo: + Active: true + Description: The CHTC instance of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + Name: Matyas Selmeci + ID: OSG1000002 + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000358 + Name: MATTHEW WESTPHALL + Security Contact: + Primary: + Name: Matyas Selmeci + ID: OSG1000002 + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000358 + Name: MATTHEW WESTPHALL + FQDN: repo.osg-htc.org + FQDNAliases: + - repo.opensciencegrid.org + - repo.osg.chtc.io + - repo-rsync.osg-htc.org + - repo-rsync.opensciencegrid.org + - repo-rsync.osg.chtc.io + Services: + Software Repo: + Description: OSG Yum Repositories + Tags: + - OSPool + VOOwnership: + OSG: 100 From 40d1dbd18e7b3e249188031287176a187bb42d0b Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 3 Oct 2025 08:54:27 -0500 Subject: [PATCH 2/5] Add topology mirror resource files --- .../FermiGrid/FNALOSGRepoMirror.yaml | 23 ++++++++ .../UChicago/UChicagoOSGRepo.yaml | 56 +++++++++++++++++++ .../UChicago/UChicago_OSGConnect.yaml | 40 ------------- .../Nebraska-Lincoln/UNLOSGRepoMirror.yaml | 27 +++++++++ .../CHTC/CHTC.yaml" | 39 ------------- .../CHTC/CHTCOSGRepo.yaml" | 43 ++++++++++++++ .../GLOW/GLOWOSGRepoMirror.yaml" | 22 ++++++++ 7 files changed, 171 insertions(+), 79 deletions(-) create mode 100644 topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml create mode 100644 topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml create mode 100644 topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml create mode 100644 "topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" create mode 100644 "topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml new file mode 100644 index 0000000000..55b9cfb5e9 --- /dev/null +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml @@ -0,0 +1,23 @@ +Production: True +SupportCenter: Community Support Center +GroupDescription: OSG Yum Repositories miror at FNAL + +Resources: + FNAL-OSG-repo-mirror: + Active: true + Description: The FNAL mirror of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + ID: 749a5ae92b94073b32c730fd3fddc5302a4dbbe5 + Name: AJIT MOHAPATRA + FQDN: linux-mirrors.fnal.gov + Services: + Software Repo Mirror: + Description: OSG Yum Repositories Mirror + Tags: + - OSPool + VOOwnership: + OSG: 100 + + diff --git a/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml b/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml new file mode 100644 index 0000000000..b047e5d919 --- /dev/null +++ b/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml @@ -0,0 +1,56 @@ +Production: True +SupportCenter: Self Supported +GroupDescription: OSG Yum Repositories and miror at UChicago + +Resources: + UChicago-OSG-repo: + Active: true + Description: The UChicago instance of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000016 + Name: Judith Stephen + Secondary: + ID: OSG1000765 + Name: David Jordan + Tertiary: + ID: OSG1000221 + Name: Farnaz Golnaraghi + FQDN: repo.osg-htc.org + FQDNAliases: + - repo.opensciencegrid.org + - repo.osgprod.tempest.chtc.io + - repo-rsync.osg-htc.org + - repo-rsync.opensciencegrid.org + - repo-rsync.osgprod.tempest.chtc.io + Services: + Software Repo: + Description: OSG Yum Repositories + Tags: + - OSPool + VOOwnership: + OSG: 100 + + UChicago-OSG-repo-mirror: + Active: true + Description: The UChicago mirror of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + ID: OSG1000016 + Name: Judith Stephen + Secondary: + ID: OSG1000765 + Name: David Jordan + Tertiary: + ID: OSG1000221 + Name: Farnaz Golnaraghi + FQDN: mirror.grid.uchicago.edu + Services: + Software Repo Mirror: + Description: OSG Yum Repositories Mirror + Tags: + - OSPool + VOOwnership: + OSG: 100 diff --git a/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml b/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml index 72b0c6db5c..8ac6fed3ca 100644 --- a/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml +++ b/topology/University of Chicago/UChicago/UChicago_OSGConnect.yaml @@ -601,43 +601,3 @@ Resources: Description: OSG Connect Project Origin Server AllowedVOs: - OSG - - UChicago-OSG-repo: - Active: true - Description: The UChicago instance of the OSG yum repositories - ContactLists: - Administrative Contact: - Primary: - ID: OSG1000016 - Name: Judith Stephen - Secondary: - ID: OSG1000765 - Name: David Jordan - Tertiary: - ID: OSG1000221 - Name: Farnaz Golnaraghi - Security Contact: - Primary: - ID: OSG1000016 - Name: Judith Stephen - Secondary: - ID: OSG1000765 - Name: David Jordan - Tertiary: - ID: OSG1000221 - Name: Farnaz Golnaraghi - FQDN: repo.osg-htc.org - FQDNAliases: - - repo.opensciencegrid.org - - repo.osgprod.tempest.chtc.io - - repo-rsync.osg-htc.org - - repo-rsync.opensciencegrid.org - - repo-rsync.osgprod.tempest.chtc.io - Services: - Software Repo: - Description: OSG Yum Repositories - Tags: - - OSPool - VOOwnership: - OSG: 100 - diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml new file mode 100644 index 0000000000..9bffe0dffb --- /dev/null +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml @@ -0,0 +1,27 @@ +Production: True +SupportCenter: Community Support Center +GroupDescription: OSG Yum Repositories mirror in Nebraska + +Resources: + Nebraska-OSG-repo-mirror: + Active: true + Description: The Nebraska mirror of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + Name: Fabio Andrijauskas + ID: OSG1000162 + Secondary: + Name: John Thiltges + ID: OSG1000004 + Tertiary: + Name: Derek Weitzel + ID: OSG1000006 + FQDN: t2.unl.edu + Services: + Software Repo Mirror: + Description: OSG Yum Repositories Mirror + Tags: + - OSPool + VOOwnership: + OSG: 100 diff --git "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" index bb7c37b4b2..1d696f5678 100644 --- "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" +++ "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTC.yaml" @@ -1054,42 +1054,3 @@ Resources: - OSPool VOOwnership: OSG: 100 - - CHTC-OSG-repo: - Active: true - Description: The CHTC instance of the OSG yum repositories - ContactLists: - Administrative Contact: - Primary: - Name: Matyas Selmeci - ID: OSG1000002 - Secondary: - ID: OSG1000003 - Name: Brian Hua Lin - Tertiary: - ID: OSG1000358 - Name: MATTHEW WESTPHALL - Security Contact: - Primary: - Name: Matyas Selmeci - ID: OSG1000002 - Secondary: - ID: OSG1000003 - Name: Brian Hua Lin - Tertiary: - ID: OSG1000358 - Name: MATTHEW WESTPHALL - FQDN: repo.osg-htc.org - FQDNAliases: - - repo.opensciencegrid.org - - repo.osg.chtc.io - - repo-rsync.osg-htc.org - - repo-rsync.opensciencegrid.org - - repo-rsync.osg.chtc.io - Services: - Software Repo: - Description: OSG Yum Repositories - Tags: - - OSPool - VOOwnership: - OSG: 100 diff --git "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" new file mode 100644 index 0000000000..d7d55b6da4 --- /dev/null +++ "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" @@ -0,0 +1,43 @@ +Production: true +SupportCenter: GLOW-TECH +GroupDescription: OSG Yum Repositories at CHTC + +Resources: + CHTC-OSG-repo: + Active: true + Description: The CHTC instance of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + Name: Matyas Selmeci + ID: OSG1000002 + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000358 + Name: MATTHEW WESTPHALL + Security Contact: + Primary: + Name: Matyas Selmeci + ID: OSG1000002 + Secondary: + ID: OSG1000003 + Name: Brian Hua Lin + Tertiary: + ID: OSG1000358 + Name: MATTHEW WESTPHALL + FQDN: repo.osg-htc.org + FQDNAliases: + - repo.opensciencegrid.org + - repo.osg.chtc.io + - repo-rsync.osg-htc.org + - repo-rsync.opensciencegrid.org + - repo-rsync.osg.chtc.io + Services: + Software Repo: + Description: OSG Yum Repositories + Tags: + - OSPool + VOOwnership: + OSG: 100 diff --git "a/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" "b/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" new file mode 100644 index 0000000000..e712464eb3 --- /dev/null +++ "b/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" @@ -0,0 +1,22 @@ +Production: True +SupportCenter: USCMS_Tier2 +GroupDescription: OSG Yum Repositories miror at GLOW + +Resources: + GLOW-OSG-repo-mirror: + Active: true + Description: The GLOW mirror of the OSG yum repositories + ContactLists: + Administrative Contact: + Primary: + ID: 749a5ae92b94073b32c730fd3fddc5302a4dbbe5 + Name: AJIT MOHAPATRA + FQDN: mirror.hep.wisc.edu + Services: + Software Repo Mirror: + Description: OSG Yum Repositories Mirror + Tags: + - OSPool + VOOwnership: + OSG: 100 + From 4594e2b549b76736b8c3fffe094170b0f2ed0174 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 3 Oct 2025 14:16:30 -0500 Subject: [PATCH 3/5] Update administrative contacts for UNL OSG repo mirror Co-authored-by: Brian Lin --- .../Nebraska-Lincoln/UNLOSGRepoMirror.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml index 9bffe0dffb..2fe87d3931 100644 --- a/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml @@ -9,12 +9,9 @@ Resources: ContactLists: Administrative Contact: Primary: - Name: Fabio Andrijauskas - ID: OSG1000162 - Secondary: Name: John Thiltges ID: OSG1000004 - Tertiary: + Secondary: Name: Derek Weitzel ID: OSG1000006 FQDN: t2.unl.edu From b450ae63a769780c1b72b18a860059eeab5fb214 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 3 Oct 2025 17:17:15 -0500 Subject: [PATCH 4/5] Remove Tag/VOOwnership from repo resources --- .../FermiGrid/FNALOSGRepoMirror.yaml | 6 ------ .../University of Chicago/UChicago/UChicagoOSGRepo.yaml | 8 -------- .../Nebraska-Lincoln/UNLOSGRepoMirror.yaml | 4 ---- .../CHTC/CHTCOSGRepo.yaml" | 4 ---- .../GLOW/GLOWOSGRepoMirror.yaml" | 5 ----- 5 files changed, 27 deletions(-) diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml index 55b9cfb5e9..f86f4b2b1a 100644 --- a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml @@ -15,9 +15,3 @@ Resources: Services: Software Repo Mirror: Description: OSG Yum Repositories Mirror - Tags: - - OSPool - VOOwnership: - OSG: 100 - - diff --git a/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml b/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml index b047e5d919..68887081dd 100644 --- a/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml +++ b/topology/University of Chicago/UChicago/UChicagoOSGRepo.yaml @@ -27,10 +27,6 @@ Resources: Services: Software Repo: Description: OSG Yum Repositories - Tags: - - OSPool - VOOwnership: - OSG: 100 UChicago-OSG-repo-mirror: Active: true @@ -50,7 +46,3 @@ Resources: Services: Software Repo Mirror: Description: OSG Yum Repositories Mirror - Tags: - - OSPool - VOOwnership: - OSG: 100 diff --git a/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml index 2fe87d3931..18c0a8d87f 100644 --- a/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml +++ b/topology/University of Nebraska/Nebraska-Lincoln/UNLOSGRepoMirror.yaml @@ -18,7 +18,3 @@ Resources: Services: Software Repo Mirror: Description: OSG Yum Repositories Mirror - Tags: - - OSPool - VOOwnership: - OSG: 100 diff --git "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" index d7d55b6da4..0c5d7aa47a 100644 --- "a/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" +++ "b/topology/University of Wisconsin\342\200\223Madison/CHTC/CHTCOSGRepo.yaml" @@ -37,7 +37,3 @@ Resources: Services: Software Repo: Description: OSG Yum Repositories - Tags: - - OSPool - VOOwnership: - OSG: 100 diff --git "a/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" "b/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" index e712464eb3..20574cd122 100644 --- "a/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" +++ "b/topology/University of Wisconsin\342\200\223Madison/GLOW/GLOWOSGRepoMirror.yaml" @@ -15,8 +15,3 @@ Resources: Services: Software Repo Mirror: Description: OSG Yum Repositories Mirror - Tags: - - OSPool - VOOwnership: - OSG: 100 - From 1e8ca05276b75a06500122da05521c294cb8c138 Mon Sep 17 00:00:00 2001 From: mwestphall Date: Fri, 10 Oct 2025 15:05:40 -0500 Subject: [PATCH 5/5] Update FNAL Mirrors Administrative Contact --- .../FermiGrid/FNALOSGRepoMirror.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml index f86f4b2b1a..a78d95cddb 100644 --- a/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml +++ b/topology/Fermi National Accelerator Laboratory/FermiGrid/FNALOSGRepoMirror.yaml @@ -9,8 +9,8 @@ Resources: ContactLists: Administrative Contact: Primary: - ID: 749a5ae92b94073b32c730fd3fddc5302a4dbbe5 - Name: AJIT MOHAPATRA + ID: 9ee3c5986e26fcbf82a16ea945d7aa98a612938e + Name: FNAL Service Desk FQDN: linux-mirrors.fnal.gov Services: Software Repo Mirror: