Skip to content

Feature: Support OSG 24 in GHAs #21

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
merged 3 commits into from
Mar 14, 2025
Merged

Feature: Support OSG 24 in GHAs #21

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7b5633
Add osg 24 to build matrix
mwestphall Jan 14, 2025
2b89ade
update dockerfile for osg 24
mwestphall Jan 14, 2025
cdd53ec
Deprecate series-less tags, update readme
mwestphall Mar 14, 2025
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
21 changes: 15 additions & 6 deletions .github/workflows/build-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ jobs:
matrix:
dver: ['8', '9']
repo: ['devel', 'testing', 'release']
series: ['23']
series:
- name: '23'
organization: opensciencegrid
- name: '24'
organization: osg-htc
steps:
- uses: actions/checkout@v3

Expand All @@ -35,20 +39,25 @@ jobs:
env:
EL_VER: ${{ matrix.dver }}
BASE_YUM_REPO: ${{ matrix.repo }}
OSG_RELEASE: ${{ matrix.series }}
OSG_RELEASE: ${{ matrix.series.name }}
TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }}
ORGANIZATION: ${{ matrix.series.organization }}
run: |
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/opensciencegrid/}
docker_repo=${GITHUB_REPOSITORY/opensciencegrid\/docker-/$ORGANIZATION/}
tags=()
for registry in hub.opensciencegrid.org docker.io; do
# osg-htc org doesn't exist in docker.io
if [[ "$registry" == "docker.io" && "$ORGANIZATION" == "osg-htc" ]]; then
continue
fi
tags+=( $registry/$docker_repo:$OSG_RELEASE-$BASE_YUM_REPO-el$EL_VER )
if [[ $EL_VER == '9' ]]; then
tags+=( $registry/$docker_repo:$OSG_RELEASE-$BASE_YUM_REPO )
if [[ $BASE_YUM_REPO == 'release' ]]; then
tags+=( $registry/$docker_repo:$OSG_RELEASE )
[[ $OSG_RELEASE == '23' ]] && tags+=( $registry/$docker_repo:latest )
[[ $OSG_RELEASE == '24' ]] && tags+=( $registry/$docker_repo:latest )
else
[[ $OSG_RELEASE == '23' ]] && tags+=( $registry/$docker_repo:$BASE_YUM_REPO )
[[ $OSG_RELEASE == '24' ]] && tags+=( $registry/$docker_repo:$BASE_YUM_REPO )
fi
fi
if [[ $BASE_YUM_REPO == 'release' ]]; then
Expand Down Expand Up @@ -93,6 +102,6 @@ jobs:
EL_VER=${{ matrix.dver }}
IMAGE_BASE=${{ steps.generate-image-base.outputs.imagebase }}
BASE_YUM_REPO=${{ matrix.repo }}
OSG_RELEASE=${{ matrix.series }}
OSG_RELEASE=${{ matrix.series.name }}
BUILDDATE=${{ needs.make-date-tag.outputs.dtag }}
tags: "${{ steps.generate-tag-list.outputs.taglist }}"
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ ARG IMAGE_BASE=quay.io/centos/centos:stream8
FROM $IMAGE_BASE

ARG EL_VER=9
ARG OSG_RELEASE=23
ARG OSG_RELEASE=24
ARG BASE_YUM_REPO=release
ARG BUILDDATE

LABEL name="OSG ${OSG_RELEASE} Worker Node Client on EL ${EL_VER} + ${BASE_YUM_REPO} repos"
LABEL build-date=${BUILDDATE}

RUN if [[ ${OSG_RELEASE} == "23" ]]; then \
RUN if [[ ${OSG_RELEASE} == "23" || ${OSG_RELEASE} == "24" ]]; then \
REL_URL_SNIPPET=23-main; \
else \
REL_URL_SNIPPET=${OSG_RELEASE}; \
Expand Down
Loading