Skip to content

Commit

Permalink
SOFTWARE-5924: Remove el7 builds from Github Workflows
Browse files Browse the repository at this point in the history
Build 3.6 images in el9 instead of el7
  • Loading branch information
mwestphall committed Jul 2, 2024
1 parent 283ce0b commit d82ccb9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/hotfix-image-builds.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODO: detect the appropriate OSG repos and OS for build and installation
# Currently we assume that upstream's version corresponds to what's in
# osg-upcoming-el7-build and osg-upcoming-testing
# osg-upcoming-el9-build and osg-upcoming-testing

name: Build XCache images based off of XRootD hotfix tags
on:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
-v $(pwd)/xrootd/:/xrootd \
-v $(pwd)/_build_dir:/u/_build_dir \
--privileged \
opensciencegrid/osg-build:el7 \
opensciencegrid/osg-build:el9 \
osg-build --verbose mock --mock-config-from-koji=osg-3.5-upcoming-el7-build _build_dir
- name: Move hotfix RPMs
if: steps.hotfix-tags.outputs.tag != 0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-series-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
repo: ['development', 'testing', 'release']
osg_series:
- name: '3.6'
os: 'el7'
os: 'el9'
- name: '23'
os: 'el9'
steps:
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
repo: ['development', 'testing', 'release']
osg_series:
- name: '3.6'
os: 'el7'
os: 'el9'
- name: '23'
os: 'el9'
runs-on: ubuntu-latest
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
repo: ['development', 'testing', 'release']
osg_series:
- name: '3.6'
os: 'el7'
os: 'el9'
- name: '23'
os: 'el9'
steps:
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
repo: ['development', 'testing', 'release']
osg_series:
- name: '3.6'
os: 'el7'
os: 'el9'
- name: '23'
os: 'el9'
needs: [make-date-tag, test-stash-cache]
Expand Down

0 comments on commit d82ccb9

Please sign in to comment.