Skip to content

Remove OSG 24 (and 23) from build matrices, add 26 #325

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

Merged
mwestphall merged 5 commits into from
Nov 4, 2026
Merged

Remove OSG 24 (and 23) from build matrices, add 26 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd58dc0
Remove OSG 24 (and 23) from build matrices, add 26
mwestphall Oct 6, 2026
1897b24
Add back 24- to all releases that depend on software-base
mwestphall Nov 3, 2026
5689d65
Change non-software-base-based images back to OSG 24
mwestphall Nov 3, 2026
5a9bfbe
Drop references to OSG 23
mwestphall Nov 3, 2026
4f018be
Merge branch 'main' into feature/osg-26
mwestphall Nov 3, 2026
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
3 changes: 1 addition & 2 deletions opensciencegrid/access-amie/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_YUM_REPO=release
ARG BASE_OSG_SERIES=23
ARG BASE_OSG_SERIES=25

FROM opensciencegrid/software-base:$BASE_OSG_SERIES-el9-$BASE_YUM_REPO

Expand All @@ -25,4 +25,3 @@ COPY . .

# run the app
CMD ["python3", "/opt/access-amie/lib/Main.py"]

2 changes: 1 addition & 1 deletion opensciencegrid/access-amie/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["23", "24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/contact-sync/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["23", "24"],
"osg_series": ["24"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/cvmfs-nodeplugin/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/default-build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24", "25"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/frontier-squid/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Specify the opensciencegrid/software-base image tag
ARG BASE_OSG_SERIES=23
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=testing
# The following could be overriden to "upcoming" (for example) to
# install the application from upcoming instead of the base yum repo.
Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/gracc-apel/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_OS=el9
ARG BASE_OSG_SERIES=23
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=release

FROM hub.opensciencegrid.org/opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/gracc-apel/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/gwms-factory/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_OS=el9
ARG BASE_OSG_SERIES=24
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=release

FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/koji-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_OSG_SERIES=24
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=release
ARG BASE_OS=el9

Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/koji-builder/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/mailchimp-sync/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["23", "24"],
"osg_series": ["24"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/ospool-ccb/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["25"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/ospool-cm/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["25"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 0 additions & 2 deletions opensciencegrid/ospool-ganglia/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,3 @@ COPY httpd-ganglia.conf /etc/httpd/conf.d/ganglia.conf
COPY index.php /var/www/html/

ADD ganglia-web-overrides /usr/share/ganglia


2 changes: 1 addition & 1 deletion opensciencegrid/ospool-static-registry/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Specify the opensciencegrid/software-base image tag
ARG BASE_OSG_SERIES=24
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=release

FROM opensciencegrid/software-base:$BASE_OSG_SERIES-el8-$BASE_YUM_REPO AS builder
Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/ospool-static-registry/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/sssd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_OS=el9
ARG BASE_OSG_SERIES=23
ARG BASE_OSG_SERIES=25
ARG BASE_YUM_REPO=release

# Run sssd via supervisord.
Expand Down
2 changes: 1 addition & 1 deletion opensciencegrid/sssd/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["23", "24"],
"osg_series": ["25", "26"],
"base_repo": ["release"]
}
4 changes: 1 addition & 3 deletions opensciencegrid/stompclt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_OSG_SERIES=23
ARG BASE_OSG_SERIES=25
ARG BASE_OS=el9
ARG BASE_YUM_REPO=development

Expand All @@ -22,5 +22,3 @@ RUN yum install -y git perl make cpan && \
perl Makefile.PL &&\
make &&\
make install


2 changes: 1 addition & 1 deletion opensciencegrid/stompclt/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["23", "24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
2 changes: 1 addition & 1 deletion opensciencegrid/svn-to-git/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
4 changes: 1 addition & 3 deletions opensciencegrid/vo-frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BASE_YUM_REPO=release
ARG BASE_OSG_SERIES=24
ARG BASE_OSG_SERIES=25
ARG BASE_OS=el9

FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO
Expand Down Expand Up @@ -53,5 +53,3 @@ ADD image-config.d/* /etc/osg/image-config.d/
ADD cron.d/* /etc/cron.d/
ADD supervisor.d/* /etc/supervisord.d/
ADD condor.d/* /etc/condor/config.d/


1 change: 0 additions & 1 deletion osg-htc/nrp-ospool-ep/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,3 @@ ENV ACCEPT_IDLE_MINUTES=20
# K8S_PROVISIONER_NAME K8S_PROVISIONER_TYPE
# FORCE_K8SNAMESPACE_MATCHING ADDITIONAL_REQUIREMENTS
#

2 changes: 1 addition & 1 deletion osg-htc/nrp-ospool-ep/build-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"standard_build": true,
"repo_build": false,
"base_os": ["el9"],
"osg_series": ["24", "25"],
"osg_series": ["24", "25", "26"],
"base_repo": ["release"]
}
Loading