From 0dde912279995c66f09fe729ff06a3863b5b0d31 Mon Sep 17 00:00:00 2001
From: Tim Theisen <tim@cs.wisc.edu>
Date: Fri, 1 Nov 2024 15:02:19 -0500
Subject: [PATCH] Updates for OSG 24

---
 bundles.ini              |  13 +++++
 repos/osg-24-el8.repo.in |  93 ++++++++++++++++++++++++++++++++++
 repos/osg-24-el9.repo.in | 107 +++++++++++++++++++++++++++++++++++++++
 upload-tarballs-to-oasis |   1 +
 4 files changed, 214 insertions(+)
 create mode 100644 repos/osg-24-el8.repo.in
 create mode 100644 repos/osg-24-el9.repo.in

diff --git a/bundles.ini b/bundles.ini
index d45e84a..1bed770 100644
--- a/bundles.ini
+++ b/bundles.ini
@@ -3,6 +3,7 @@ default_bundles_3.4=osg-wn-client-3.4 osg-afs-client-3.4
 default_bundles_3.5=osg-wn-client-3.5 osg-afs-client-3.5
 default_bundles_3.6=osg-wn-client-3.6
 default_bundles_23=osg-wn-client-23
+default_bundles_24=osg-wn-client-24
 
 ; This file defines the tarball bundles that we can create
 
@@ -113,6 +114,18 @@ packages    = osg-wn-client osg-update-data
 repofile    = repos/osg-23-%(dver)s.repo.in
 stage1file  = osg-stage1-%(dver)s.lst
 
+[osg-wn-client-24]
+paramsets   = el8,x86_64 el9,x86_64
+patchdirs   = patches/wn-client/common
+              patches/wn-client/common/%(dver)s
+              patches/wn-client/24/%(dver)s
+
+dirname     = osg-wn-client
+tarballname = osg-wn-client-%(version)s-%(relnum)s.%(dver)s.%(basearch)s.tar.gz
+packages    = osg-wn-client osg-update-data
+repofile    = repos/osg-24-%(dver)s.repo.in
+stage1file  = osg-stage1-%(dver)s.lst
+
 [osg-afs-client-3.5]
 paramsets   = el7,x86_64
 patchdirs   = patches/wn-client/common
diff --git a/repos/osg-24-el8.repo.in b/repos/osg-24-el8.repo.in
new file mode 100644
index 0000000..3258a89
--- /dev/null
+++ b/repos/osg-24-el8.repo.in
@@ -0,0 +1,93 @@
+[osg-minefield-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-development/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-development (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+[os-appstream]
+name=AlmaLinux 8 - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/appstream
+#baseurl=https://repo.almalinux.org/almalinux/8/AppStream/%(basearch)s/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[os-baseos]
+name=AlmaLinux 8 - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/baseos
+#baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/%(basearch)s/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[os-extras]
+name=AlmaLinux 8 - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/extras
+#baseurl=https://repo.almalinux.org/almalinux/8/extras/%(basearch)s/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[os-powertools]
+name=AlmaLinux 8 - PowerTools
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/powertools
+#baseurl=https://repo.almalinux.org/almalinux/8/PowerTools/%(basearch)s/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
+
+[os-epel]
+name=Extra Packages for Enterprise Linux 8 - %(basearch)s
+#baseurl=https://download.fedoraproject.org/pub/epel/8/Everything/%(basearch)s
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=%(basearch)s&infra=$infra&content=$contentdir
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+
+[osg-testing-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/24-main/%(dver)s/testing/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-testing/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-testing (%(basearch)s)
+enabled = 0
+includepkgs =
+
+[devops-production-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/production/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-production/latest/%(basearch)s/
+name = osg-devops-production (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+[devops-itb-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/itb/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-itb/latest/%(basearch)s/
+name = osg-devops-itb (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+# prerelease needs to have better priority than release-build to
+# properly handle the edge case where release-build has a package of
+# higher version than prerelease.
+[osg-prerelease-for-tarball]
+priority = 97
+gpgcheck = 0
+baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-prerelease/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-prerelease (%(basearch)s)
+enabled = 1
+
+[osg-release-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/24-main/%(dver)s/release/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-release/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-release (%(basearch)s)
+enabled = 1
+
diff --git a/repos/osg-24-el9.repo.in b/repos/osg-24-el9.repo.in
new file mode 100644
index 0000000..75b4fb3
--- /dev/null
+++ b/repos/osg-24-el9.repo.in
@@ -0,0 +1,107 @@
+[osg-minefield-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-development/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-development (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+[os-appstream]
+name=AlmaLinux %(dver)s - AppStream
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/appstream
+# baseurl=https://repo.almalinux.org/almalinux/9/AppStream/%(basearch)s/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+[os-baseos]
+name=AlmaLinux %(dver)s - BaseOS
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/baseos
+# baseurl=https://repo.almalinux.org/almalinux/9/BaseOS/%(basearch)s/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+#additional packages that may be useful
+[os-extras]
+name=AlmaLinux %(dver)s - Extras
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/extras
+# baseurl=https://repo.almalinux.org/almalinux/9/extras/%(basearch)s/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[os-crb]
+name=AlmaLinux %(dver)s - CRB
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/crb
+# baseurl=https://repo.almalinux.org/almalinux/9/CRB/%(basearch)s/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[os-epel]
+name=Extra Packages for Enterprise Linux %(dver)s - %(basearch)s
+#baseurl=https://download.example/pub/epel/%(dver)s/Everything/%(basearch)s/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=%(basearch)s&infra=$infra&content=$contentdir
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%(dver)s
+
+[osg-testing-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/24-main/%(dver)s/testing/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-testing/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-testing (%(basearch)s)
+enabled = 0
+includepkgs =
+
+[devops-production-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/production/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-production/latest/%(basearch)s/
+name = osg-devops-production (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+[devops-itb-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/itb/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-itb/latest/%(basearch)s/
+name = osg-devops-itb (%(basearch)s)
+enabled = 0
+#includepkgs =
+
+# prerelease needs to have better priority than release-build to
+# properly handle the edge case where release-build has a package of
+# higher version than prerelease.
+[osg-prerelease-for-tarball]
+priority = 97
+gpgcheck = 0
+baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-prerelease/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-prerelease (%(basearch)s)
+enabled = 1
+
+[osg-release-for-tarball]
+priority = 98
+gpgcheck = 0
+baseurl = https://repo.opensciencegrid.org/osg/24-main/%(dver)s/release/%(basearch)s/
+#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-24-main-%(dver)s-release/latest/%(basearch)s/
+name = osg-24-main-%(dver)s-release (%(basearch)s)
+enabled = 1
+
diff --git a/upload-tarballs-to-oasis b/upload-tarballs-to-oasis
index 6dc4a8b..b6b04d0 100755
--- a/upload-tarballs-to-oasis
+++ b/upload-tarballs-to-oasis
@@ -197,6 +197,7 @@ foreach_dver_arch() {
         3.5) dver_arches=({el7,el8}.x86_64);;
         3.6) dver_arches=({el7,el8,el9}.x86_64);;
         23-main) dver_arches=({el8,el9}.x86_64);;
+        24-main) dver_arches=({el8,el9}.x86_64);;
     esac
 
     for dver_arch in ${dver_arches[@]}; do