Skip to content

Commit 7baeacf

Browse files
timtheisentimtheisen
authored
Merge pull request #67 from mwestphall/SOFTWARE-6057-osg-25
Updates for OSG 25
2 parents c49a8bc + 791302f commit 7baeacf

File tree

5 files changed

+321
-0
lines changed

5 files changed

+321
-0
lines changed

‎bundles.ini‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ default_bundles_3.5=osg-wn-client-3.5 osg-afs-client-3.5
44
default_bundles_3.6=osg-wn-client-3.6
55
default_bundles_23=osg-wn-client-23
66
default_bundles_24=osg-wn-client-24
7+
default_bundles_25=osg-wn-client-25
78

89
; This file defines the tarball bundles that we can create
910

@@ -126,6 +127,18 @@ packages = osg-wn-client osg-update-data
126127
repofile = repos/osg-24-%(dver)s.repo.in
127128
stage1file = osg-stage1-%(dver)s.lst
128129

130+
[osg-wn-client-25]
131+
paramsets = el8,x86_64 el9,x86_64 el10,x86_64
132+
patchdirs = patches/wn-client/common
133+
patches/wn-client/common/%(dver)s
134+
patches/wn-client/2xi54/%(dver)s
135+
136+
dirname = osg-wn-client
137+
tarballname = osg-wn-client-%(version)s-%(relnum)s.%(dver)s.%(basearch)s.tar.gz
138+
packages = osg-wn-client osg-update-data
139+
repofile = repos/osg-25-%(dver)s.repo.in
140+
stage1file = osg-stage1-%(dver)s.lst
141+
129142
[osg-afs-client-3.5]
130143
paramsets = el7,x86_64
131144
patchdirs = patches/wn-client/common

‎repos/osg-25-el10.repo.in‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
[osg-minefield-for-tarball]
2+
priority = 98
3+
gpgcheck = 0
4+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-development/latest/%(basearch)s/
5+
name = osg-25-main-%(dver)s-development (%(basearch)s)
6+
enabled = 0
7+
#includepkgs =
8+
9+
[os-appstream]
10+
name=AlmaLinux %(dver)s - AppStream
11+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/10/appstream
12+
# baseurl=https://repo.almalinux.org/almalinux/10/AppStream/%(basearch)s/os/
13+
enabled=1
14+
gpgcheck=1
15+
countme=1
16+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
17+
metadata_expire=86400
18+
enabled_metadata=1
19+
20+
[os-baseos]
21+
name=AlmaLinux %(dver)s - BaseOS
22+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/10/baseos
23+
# baseurl=https://repo.almalinux.org/almalinux/10/BaseOS/%(basearch)s/os/
24+
enabled=1
25+
gpgcheck=1
26+
countme=1
27+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
28+
metadata_expire=86400
29+
enabled_metadata=1
30+
31+
#additional packages that may be useful
32+
[os-extras]
33+
name=AlmaLinux %(dver)s - Extras
34+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/10/extras
35+
# baseurl=https://repo.almalinux.org/almalinux/10/extras/%(basearch)s/os/
36+
enabled=1
37+
gpgcheck=1
38+
countme=1
39+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
40+
metadata_expire=86400
41+
enabled_metadata=0
42+
43+
[os-crb]
44+
name=AlmaLinux %(dver)s - CRB
45+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/10/crb
46+
# baseurl=https://repo.almalinux.org/almalinux/10/CRB/%(basearch)s/os/
47+
enabled=1
48+
gpgcheck=1
49+
countme=1
50+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
51+
metadata_expire=86400
52+
enabled_metadata=0
53+
54+
[os-epel]
55+
name=Extra Packages for Enterprise Linux %(dver)s - %(basearch)s
56+
#baseurl=https://download.example/pub/epel/%(dver)s/Everything/%(basearch)s/
57+
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=%(basearch)s&infra=$infra&content=$contentdir
58+
enabled=1
59+
gpgcheck=1
60+
countme=1
61+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%(dver)s
62+
63+
[osg-testing-for-tarball]
64+
priority = 98
65+
gpgcheck = 0
66+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/testing/%(basearch)s/
67+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-testing/latest/%(basearch)s/
68+
name = osg-25-main-%(dver)s-testing (%(basearch)s)
69+
enabled = 0
70+
includepkgs =
71+
72+
[devops-production-for-tarball]
73+
priority = 98
74+
gpgcheck = 0
75+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/production/%(basearch)s/
76+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-production/latest/%(basearch)s/
77+
name = osg-devops-production (%(basearch)s)
78+
enabled = 0
79+
#includepkgs =
80+
81+
[devops-itb-for-tarball]
82+
priority = 98
83+
gpgcheck = 0
84+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/itb/%(basearch)s/
85+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-itb/latest/%(basearch)s/
86+
name = osg-devops-itb (%(basearch)s)
87+
enabled = 0
88+
#includepkgs =
89+
90+
# prerelease needs to have better priority than release-build to
91+
# properly handle the edge case where release-build has a package of
92+
# higher version than prerelease.
93+
[osg-prerelease-for-tarball]
94+
priority = 97
95+
gpgcheck = 0
96+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-prerelease/latest/%(basearch)s/
97+
name = osg-25-main-%(dver)s-prerelease (%(basearch)s)
98+
enabled = 1
99+
100+
[osg-release-for-tarball]
101+
priority = 98
102+
gpgcheck = 0
103+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/release/%(basearch)s/
104+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-release/latest/%(basearch)s/
105+
name = osg-25-main-%(dver)s-release (%(basearch)s)
106+
enabled = 1
107+

‎repos/osg-25-el8.repo.in‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
[osg-minefield-for-tarball]
2+
priority = 98
3+
gpgcheck = 0
4+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-development/latest/%(basearch)s/
5+
name = osg-25-main-%(dver)s-development (%(basearch)s)
6+
enabled = 0
7+
#includepkgs =
8+
9+
[os-appstream]
10+
name=AlmaLinux 8 - AppStream
11+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/appstream
12+
#baseurl=https://repo.almalinux.org/almalinux/8/AppStream/%(basearch)s/os/
13+
gpgcheck=1
14+
enabled=1
15+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
16+
17+
[os-baseos]
18+
name=AlmaLinux 8 - BaseOS
19+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/baseos
20+
#baseurl=https://repo.almalinux.org/almalinux/8/BaseOS/%(basearch)s/os/
21+
gpgcheck=1
22+
enabled=1
23+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
24+
25+
[os-extras]
26+
name=AlmaLinux 8 - Extras
27+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/extras
28+
#baseurl=https://repo.almalinux.org/almalinux/8/extras/%(basearch)s/os/
29+
gpgcheck=1
30+
enabled=1
31+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
32+
33+
[os-powertools]
34+
name=AlmaLinux 8 - PowerTools
35+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/8/powertools
36+
#baseurl=https://repo.almalinux.org/almalinux/8/PowerTools/%(basearch)s/os/
37+
gpgcheck=1
38+
enabled=1
39+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
40+
41+
[os-epel]
42+
name=Extra Packages for Enterprise Linux 8 - %(basearch)s
43+
#baseurl=https://download.fedoraproject.org/pub/epel/8/Everything/%(basearch)s
44+
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=%(basearch)s&infra=$infra&content=$contentdir
45+
enabled=1
46+
gpgcheck=1
47+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
48+
49+
[osg-testing-for-tarball]
50+
priority = 98
51+
gpgcheck = 0
52+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/testing/%(basearch)s/
53+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-testing/latest/%(basearch)s/
54+
name = osg-25-main-%(dver)s-testing (%(basearch)s)
55+
enabled = 0
56+
includepkgs =
57+
58+
[devops-production-for-tarball]
59+
priority = 98
60+
gpgcheck = 0
61+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/production/%(basearch)s/
62+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-production/latest/%(basearch)s/
63+
name = osg-devops-production (%(basearch)s)
64+
enabled = 0
65+
#includepkgs =
66+
67+
[devops-itb-for-tarball]
68+
priority = 98
69+
gpgcheck = 0
70+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/itb/%(basearch)s/
71+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-itb/latest/%(basearch)s/
72+
name = osg-devops-itb (%(basearch)s)
73+
enabled = 0
74+
#includepkgs =
75+
76+
# prerelease needs to have better priority than release-build to
77+
# properly handle the edge case where release-build has a package of
78+
# higher version than prerelease.
79+
[osg-prerelease-for-tarball]
80+
priority = 97
81+
gpgcheck = 0
82+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-prerelease/latest/%(basearch)s/
83+
name = osg-25-main-%(dver)s-prerelease (%(basearch)s)
84+
enabled = 1
85+
86+
[osg-release-for-tarball]
87+
priority = 98
88+
gpgcheck = 0
89+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/release/%(basearch)s/
90+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-release/latest/%(basearch)s/
91+
name = osg-25-main-%(dver)s-release (%(basearch)s)
92+
enabled = 1
93+

‎repos/osg-25-el9.repo.in‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
[osg-minefield-for-tarball]
2+
priority = 98
3+
gpgcheck = 0
4+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-development/latest/%(basearch)s/
5+
name = osg-25-main-%(dver)s-development (%(basearch)s)
6+
enabled = 0
7+
#includepkgs =
8+
9+
[os-appstream]
10+
name=AlmaLinux %(dver)s - AppStream
11+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/appstream
12+
# baseurl=https://repo.almalinux.org/almalinux/9/AppStream/%(basearch)s/os/
13+
enabled=1
14+
gpgcheck=1
15+
countme=1
16+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
17+
metadata_expire=86400
18+
enabled_metadata=1
19+
20+
[os-baseos]
21+
name=AlmaLinux %(dver)s - BaseOS
22+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/baseos
23+
# baseurl=https://repo.almalinux.org/almalinux/9/BaseOS/%(basearch)s/os/
24+
enabled=1
25+
gpgcheck=1
26+
countme=1
27+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
28+
metadata_expire=86400
29+
enabled_metadata=1
30+
31+
#additional packages that may be useful
32+
[os-extras]
33+
name=AlmaLinux %(dver)s - Extras
34+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/extras
35+
# baseurl=https://repo.almalinux.org/almalinux/9/extras/%(basearch)s/os/
36+
enabled=1
37+
gpgcheck=1
38+
countme=1
39+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
40+
metadata_expire=86400
41+
enabled_metadata=0
42+
43+
[os-crb]
44+
name=AlmaLinux %(dver)s - CRB
45+
mirrorlist=https://mirrors.almalinux.org/mirrorlist/9/crb
46+
# baseurl=https://repo.almalinux.org/almalinux/9/CRB/%(basearch)s/os/
47+
enabled=1
48+
gpgcheck=1
49+
countme=1
50+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
51+
metadata_expire=86400
52+
enabled_metadata=0
53+
54+
[os-epel]
55+
name=Extra Packages for Enterprise Linux %(dver)s - %(basearch)s
56+
#baseurl=https://download.example/pub/epel/%(dver)s/Everything/%(basearch)s/
57+
metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-9&arch=%(basearch)s&infra=$infra&content=$contentdir
58+
enabled=1
59+
gpgcheck=1
60+
countme=1
61+
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-%(dver)s
62+
63+
[osg-testing-for-tarball]
64+
priority = 98
65+
gpgcheck = 0
66+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/testing/%(basearch)s/
67+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-testing/latest/%(basearch)s/
68+
name = osg-25-main-%(dver)s-testing (%(basearch)s)
69+
enabled = 0
70+
includepkgs =
71+
72+
[devops-production-for-tarball]
73+
priority = 98
74+
gpgcheck = 0
75+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/production/%(basearch)s/
76+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-production/latest/%(basearch)s/
77+
name = osg-devops-production (%(basearch)s)
78+
enabled = 0
79+
#includepkgs =
80+
81+
[devops-itb-for-tarball]
82+
priority = 98
83+
gpgcheck = 0
84+
baseurl = https://repo.opensciencegrid.org/osg/devops/%(dver)s/itb/%(basearch)s/
85+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/devops-%(dver)s-itb/latest/%(basearch)s/
86+
name = osg-devops-itb (%(basearch)s)
87+
enabled = 0
88+
#includepkgs =
89+
90+
# prerelease needs to have better priority than release-build to
91+
# properly handle the edge case where release-build has a package of
92+
# higher version than prerelease.
93+
[osg-prerelease-for-tarball]
94+
priority = 97
95+
gpgcheck = 0
96+
baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-prerelease/latest/%(basearch)s/
97+
name = osg-25-main-%(dver)s-prerelease (%(basearch)s)
98+
enabled = 1
99+
100+
[osg-release-for-tarball]
101+
priority = 98
102+
gpgcheck = 0
103+
baseurl = https://repo.opensciencegrid.org/osg/25-main/%(dver)s/release/%(basearch)s/
104+
#baseurl = http://koji.chtc.wisc.edu/mnt/koji/repos/osg-25-main-%(dver)s-release/latest/%(basearch)s/
105+
name = osg-25-main-%(dver)s-release (%(basearch)s)
106+
enabled = 1
107+

‎upload-tarballs-to-oasis‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ foreach_dver_arch() {
198198
3.6) dver_arches=({el7,el8,el9}.x86_64);;
199199
23-main) dver_arches=({el8,el9}.x86_64);;
200200
24-main) dver_arches=({el8,el9}.x86_64);;
201+
25-main) dver_arches=({el8,el9,el10}.x86_64);;
201202
esac
202203

203204
for dver_arch in ${dver_arches[@]}; do

0 commit comments

Comments
 (0)