Backport 24-main/osg-release changes to 23-main (SOFTWARE-5986)

Namely: - Use osg-htc.org instead of opensciencegrid.org - Use "distrepo" repos for minefield - Drop osg-next repo files also delete unused GPG key files git-svn-id: https://vdt.cs.wisc.edu/svn/native/redhat/branches/23-main@28038 4e558342-562e-0410-864c-e07659590f8c
opensciencegrid · Sep 25, 2024 · 3ddc252 · 3ddc252
1 parent e4e0dfb
commit 3ddc252
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 146 deletions.
diff --git a/osg-release/osg/RPM-GPG-KEY-OSG-2 b/osg-release/osg/RPM-GPG-KEY-OSG-2
diff --git a/osg-release/osg/RPM-GPG-KEY-OSG-4 b/osg-release/osg/RPM-GPG-KEY-OSG-4
diff --git a/osg-release/osg/osg-release.spec b/osg-release/osg/osg-release.spec
@@ -1,10 +1,12 @@
+%define series 23
+
 Name:           osg-release
-Version:        23
-Release:        5%{?dist}
+Version:        %{series}
+Release:        6%{?dist}
 Summary:        OSG Software for Enterprise Linux repository configuration
 
 License:        GPL
-URL:            https://repo.opensciencegrid.org/
+URL:            https://repo.osg-htc.org/
 
 # This is a OSG Software maintained package which is specific to
 # our distribution.  Thus the source is only available from
@@ -15,20 +17,19 @@ Source0:        generate-repo-files.sh
 Source1:        repoinfo.txt
 Source2:        template.repo.standard
 Source3:        template.repo.basic
-Source4:        template.repo.koji
+Source4:        template.repo.kojira
 Source5:        template.repo.direct
 Source6:        template.repo.contrib
+Source7:        template.repo.distrepo
 
-Source41:       RPM-GPG-KEY-OSG-23-auto
-Source42:       RPM-GPG-KEY-OSG-23-developer
+Source41:       RPM-GPG-KEY-OSG-%{series}-auto
+Source42:       RPM-GPG-KEY-OSG-%{series}-developer
 
 
 BuildArch:      noarch
 
 Requires:       redhat-release >= %{rhel}
 
-Obsoletes:      vdt-release
-
 %description
 This package contains the OSG Software for Enterprise Linux repository
 configuration for yum.
@@ -43,27 +44,30 @@ exit 0
 
 %install
 
-#GPG Key
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
-install -pm 644 %{SOURCE41} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-auto
-install -pm 644 %{SOURCE42} \
-    $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-developer
+# GPG Key
+install -D -pm 644 %{SOURCE41} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-auto
+install -D -pm 644 %{SOURCE42} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-developer
 
 # yum
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
 
 install -m 644 *.repo $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
-sed -i -e 's/gpgcheck=1/gpgcheck=0/' $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/*-minefield.repo
 
 %files
 %defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/*
-/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-auto
-/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-23-developer
+/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-auto
+/etc/pki/rpm-gpg/RPM-GPG-KEY-OSG-%{series}-developer
 
 
 %changelog
+* Tue Sep 24 2024 Mátyás Selmeci <[email protected]> - 23-6
+- Use osg-htc.org (SOFTWARE-5986)
+- Use "distrepo" repos for minefield (SOFTWARE-5986)
+- Drop osg-next repo files (SOFTWARE-5986)
+
 * Wed Oct 18 2023 Mátyás Selmeci <[email protected]> - 23-5
 - Use 'auto' key for prerelease repo
 

diff --git a/osg-release/osg/repoinfo.txt b/osg-release/osg/repoinfo.txt
@@ -5,21 +5,16 @@ osg-development           23-main       development  standard  Development
 osg-testing               23-main       testing      standard  Testing
 osg-contrib               23-contrib    contrib      contrib   Contributed
 osg-empty                 23-empty      empty        basic     Empty_Packages
-osg-minefield             23-main       development  koji      Build_Repository
-osg-prerelease            23-main       prerelease   koji      Prerelease_Repository_for_Internal_Use
+osg-minefield             23-main       development  distrepo  Build_Repository
+osg-prerelease            23-main       prerelease   kojira    Prerelease_Repository_for_Internal_Use
 
 osg-internal-development      23-internal   development  direct    Internal_Development
 osg-internal                  23-internal   release      direct    Internal
-osg-internal-minefield        23-internal   development  koji      Internal_build_Repository
+osg-internal-minefield        23-internal   development  distrepo  Internal_build_Repository
 
 osg-upcoming              23-upcoming   release      standard  Upcoming
 osg-upcoming-development  23-upcoming   development  standard  Upcoming_Development
 osg-upcoming-testing      23-upcoming   testing      standard  Upcoming_Testing
-osg-upcoming-minefield    23-upcoming   development  koji      Upcoming_Build_Repository
-osg-upcoming-prerelease   23-upcoming   prerelease   koji      Upcoming_Prerelease_Repository_for_Internal_Use
-
-osg-next                  24            release      standard  Next_Release_Series
-osg-next-development      24            development  standard  Next_Development_Series
-osg-next-testing          24            testing      standard  Next_Testing_Series
-osg-next-minefield        24            development  koji      Next_Build_Repository_Series
+osg-upcoming-minefield    23-upcoming   development  distrepo  Upcoming_Build_Repository
+osg-upcoming-prerelease   23-upcoming   prerelease   kojira    Upcoming_Prerelease_Repository_for_Internal_Use
 
diff --git a/osg-release/osg/template.repo.basic b/osg-release/osg/template.repo.basic
@@ -1,7 +1,7 @@
 [{YUMREPO}]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/$basearch
+#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch
+mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/$basearch
 priority=98
 enabled=0
 gpgcheck=1

diff --git a/osg-release/osg/template.repo.contrib b/osg-release/osg/template.repo.contrib
@@ -1,23 +1,23 @@
 [{YUMREPO}]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/$basearch
+#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch
+mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/$basearch
 priority=98
 enabled={ENABLED}
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-source]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/source/SRPMS
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/source/SRPMS
 priority=98
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-debuginfo]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/$basearch/debug
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/$basearch/debug
 priority=98
 enabled=0
 gpgcheck=1

diff --git a/osg-release/osg/template.repo.direct b/osg-release/osg/template.repo.direct
@@ -1,23 +1,23 @@
 [{YUMREPO}]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch
-#mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch
+#mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch
 priority=98
 enabled={ENABLED}
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-source]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS
 priority=98
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-debuginfo]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug
 priority=98
 enabled=0
 gpgcheck=1

diff --git a/osg-release/osg/template.repo.distrepo b/osg-release/osg/template.repo.distrepo
@@ -0,0 +1,16 @@
+[{YUMREPO}]
+name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
+baseurl=https://koji.osg-htc.org/mnt/koji/repos-dist/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/
+priority=98
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
+
+[{YUMREPO}-source]
+name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source
+baseurl=https://koji.osg-htc.org/mnt/koji/repos-dist/osg-{SERIES}-el{EL}-{REPO}/latest/src/
+priority=98
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
+
diff --git a/osg-release/osg/template.repo.koji → osg-release/osg/template.repo.kojira b/osg-release/osg/template.repo.koji → osg-release/osg/template.repo.kojira
@@ -1,6 +1,6 @@
 [{YUMREPO}]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
-baseurl=https://koji.opensciencegrid.org/mnt/koji/repos/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/
+baseurl=https://koji.osg-htc.org/mnt/koji/repos/osg-{SERIES}-el{EL}-{REPO}/latest/$basearch/
 priority=98
 enabled=0
 gpgcheck=1

diff --git a/osg-release/osg/template.repo.standard b/osg-release/osg/template.repo.standard
@@ -1,23 +1,23 @@
 [{YUMREPO}]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch
-#baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch
-mirrorlist=https://repo.opensciencegrid.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch
+#baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch
+mirrorlist=https://repo.osg-htc.org/mirror/osg/{SERIES}/el{EL}/{REPO}/$basearch
 priority=98
 enabled={ENABLED}
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-source]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Source
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/source/SRPMS
 priority=98
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/{GPGKEY}
 
 [{YUMREPO}-debuginfo]
 name=OSG Software for Enterprise Linux {EL} {TITLE} $basearch - Debug
-baseurl=https://repo.opensciencegrid.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug
+baseurl=https://repo.osg-htc.org/osg/{SERIES}/el{EL}/{REPO}/$basearch/debug
 priority=98
 enabled=0
 gpgcheck=1