Skip to content

SOFTWARE-6027: OSG 24 (take 2) #120

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
matyasselmeci merged 3 commits into from
Dec 4, 2024
Merged

SOFTWARE-6027: OSG 24 (take 2) #120

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
042bada
handle pushing to osg-htc in osg-24 and opensciencegrid in osg-23
mwestphall Nov 1, 2024
02c735f
exclude stash-cache/origin builds from osg-24
mwestphall Nov 19, 2024
d922220
Add missing exclude
mwestphall Nov 20, 2024
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
28 changes: 27 additions & 1 deletion .github/workflows/release-series-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,15 @@ jobs:
osg_series:
- name: '23'
os: 'el9'
- name: '24'
os: 'el9'
exclude:
- osg_series:
name: 24
image: stash-cache
- osg_series:
name: 24
image: stash-origin
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -107,6 +116,7 @@ jobs:
matrix:
repo: ['development', 'testing', 'release']
osg_series:
# TODO build new test suite for osg 24 pelican origin/cache tooling
- name: '23'
os: 'el9'
steps:
Expand Down Expand Up @@ -177,6 +187,17 @@ jobs:
osg_series:
- name: '23'
os: 'el9'
organization: 'opensciencegrid'
- name: '24'
os: 'el9'
organization: 'osg-htc'
exclude:
- osg_series:
name: 24
image: stash-cache
- osg_series:
name: 24
image: stash-origin
needs: [make-date-tag, test-stash-cache]
runs-on: ubuntu-latest
steps:
Expand All @@ -194,11 +215,16 @@ jobs:
REPO: ${{ matrix.repo }}
SERIES: ${{ matrix.osg_series.name }}
IMAGE: ${{ matrix.image }}
ORGANIZATION: ${{ matrix.osg_series.organization }}
TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }}
run: |
docker_repo=opensciencegrid/$IMAGE
docker_repo=$ORGANIZATION/$IMAGE
tag_list=()
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
for image_tag in "$SERIES-$REPO" "$SERIES-$REPO-$TIMESTAMP"; do
tag_list+=("$registry/$docker_repo":"$image_tag")
done
Expand Down
Loading