Skip to content

Commit 9909675

Browse files
committed
Drop OSG 23 builds
Since stash-cache and stash-origin are not in OSG 24+, also drop stash-cache and stash-origin builds entirely, and the "test-stash-cache" task. Update the "push-image" step to depend on "xcache-image-builds" explicitly instead of implicitly via "test-stash-cache".
1 parent 4abe013 commit 9909675

1 file changed

Lines changed: 4 additions & 85 deletions

File tree

.github/workflows/release-series-builds.yml

Lines changed: 4 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
matrix:
2323
repo: ['development', 'testing', 'release']
2424
osg_series:
25-
- name: '23'
26-
os: 'el9'
2725
- name: '24'
2826
os: 'el9'
2927
steps:
@@ -61,20 +59,11 @@ jobs:
6159
strategy:
6260
fail-fast: False
6361
matrix:
64-
image: [atlas-xcache, cms-xcache, stash-cache, stash-origin]
62+
image: [atlas-xcache, cms-xcache]
6563
repo: ['development', 'testing', 'release']
6664
osg_series:
67-
- name: '23'
68-
os: 'el9'
6965
- name: '24'
7066
os: 'el9'
71-
exclude:
72-
- osg_series:
73-
name: 24
74-
image: stash-cache
75-
- osg_series:
76-
name: 24
77-
image: stash-origin
7867
runs-on: ubuntu-latest
7968
steps:
8069
- uses: actions/checkout@v3
@@ -106,66 +95,6 @@ jobs:
10695
cache-from: type=local,src=/tmp/.base-buildx-cache
10796
cache-to: type=local,dest=/tmp/.${{ matrix.image }}-buildx-cache,mode=max
10897

109-
test-stash-cache:
110-
name: Test Stash Cache and Origin
111-
needs: [xcache-image-builds]
112-
runs-on: ubuntu-latest
113-
continue-on-error: ${{ matrix.repo == 'development' }}
114-
strategy:
115-
fail-fast: False
116-
matrix:
117-
repo: ['development', 'testing', 'release']
118-
osg_series:
119-
# TODO build new test suite for osg 24 pelican origin/cache tooling
120-
- name: '23'
121-
os: 'el9'
122-
steps:
123-
- uses: actions/checkout@v3
124-
125-
- name: Load stash-cache build cache
126-
uses: actions/cache@v3
127-
with:
128-
path: /tmp/.stash-cache-buildx-cache
129-
key: stash-cache-${{ matrix.osg_series.name }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }}
130-
131-
- name: Load stash-origin build cache
132-
uses: actions/cache@v3
133-
with:
134-
path: /tmp/.stash-origin-buildx-cache
135-
key: stash-origin-${{ matrix.osg_series.name }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }}
136-
137-
- name: Set up Docker Buildx
138-
uses: docker/setup-buildx-action@v2.7.0
139-
140-
- name: Load stash-cache image
141-
uses: docker/build-push-action@v4
142-
with:
143-
context: .
144-
build-args: |
145-
BASE_YUM_REPO=${{ matrix.repo }}
146-
BASE_OSG_SERIES=${{ matrix.osg_series.name }}
147-
BASE_OS=${{ matrix.osg_series.os }}
148-
load: True # allow access to built images through the Docker CLI
149-
tags: stash-cache:latest
150-
target: stash-cache
151-
cache-from: type=local,src=/tmp/.stash-cache-buildx-cache
152-
153-
- name: Load stash-origin image
154-
uses: docker/build-push-action@v4
155-
with:
156-
context: .
157-
build-args: |
158-
BASE_YUM_REPO=${{ matrix.repo }}
159-
BASE_OSG_SERIES=${{ matrix.osg_series.name }}
160-
BASE_OS=${{ matrix.osg_series.os }}
161-
load: True # allow access to built images through the Docker CLI
162-
tags: stash-origin:latest
163-
target: stash-origin
164-
cache-from: type=local,src=/tmp/.stash-origin-buildx-cache
165-
166-
- run: ./tests/test_stashcache_origin.sh "stash-origin:latest"
167-
- run: ./tests/test_stashcache.sh "stash-cache:latest"
168-
16998
make-date-tag:
17099
runs-on: ubuntu-latest
171100
if: contains(fromJson('["push", "repository_dispatch", "workflow_dispatch"]'), github.event_name) && startsWith(github.repository, 'opensciencegrid/')
@@ -182,23 +111,13 @@ jobs:
182111
strategy:
183112
fail-fast: False
184113
matrix:
185-
image: [atlas-xcache, cms-xcache, stash-cache, stash-origin, xcache]
114+
image: [atlas-xcache, cms-xcache, xcache]
186115
repo: ['development', 'testing', 'release']
187116
osg_series:
188-
- name: '23'
189-
os: 'el9'
190-
organization: 'opensciencegrid'
191117
- name: '24'
192118
os: 'el9'
193119
organization: 'osg-htc'
194-
exclude:
195-
- osg_series:
196-
name: 24
197-
image: stash-cache
198-
- osg_series:
199-
name: 24
200-
image: stash-origin
201-
needs: [make-date-tag, test-stash-cache]
120+
needs: [make-date-tag, xcache-image-builds]
202121
runs-on: ubuntu-latest
203122
steps:
204123
- uses: actions/checkout@v3
@@ -242,7 +161,7 @@ jobs:
242161
with:
243162
username: ${{ secrets.DOCKER_USERNAME }}
244163
password: ${{ secrets.DOCKER_PASSWORD }}
245-
164+
246165
- name: Log in to OSG Harbor
247166
uses: docker/login-action@v2.2.0
248167
with:

0 commit comments

Comments
 (0)