Skip to content

Commit 0b35072

Browse files
aldbraldbr
committed
feat: deploy gubbins images
1 parent 810af65 commit 0b35072

File tree

3 files changed

+122
-26
lines changed

3 files changed

+122
-26
lines changed

‎.github/workflows/deployment.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,109 @@ jobs:
219219
platforms: linux/amd64,linux/arm64
220220
build-args: |
221221
EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration
222+
223+
# -------------------------------------------------------------------------------------------------
224+
# Gubbins deployment
225+
# -------------------------------------------------------------------------------------------------
226+
227+
build-gubbins-wheels:
228+
name: Build wheels
229+
runs-on: "ubuntu-latest"
230+
needs: deploy-pypi
231+
if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
232+
defaults:
233+
run:
234+
# We need extglob for REFERENCE_BRANCH substitution
235+
shell: bash -l -O extglob {0}
236+
steps:
237+
- name: Checkout
238+
uses: actions/checkout@v4
239+
- uses: actions/setup-python@v5
240+
with:
241+
python-version: '3.11'
242+
- name: Installing dependencies
243+
run: |
244+
python -m pip install \
245+
build \
246+
python-dateutil \
247+
pytz \
248+
readme_renderer[md] \
249+
requests \
250+
setuptools_scm
251+
- name: Build distributions
252+
run: |
253+
# build the gubbins package
254+
for pkg_dir in $PWD/extensions/gubbins/gubbins-*; do
255+
# Skip the testing package
256+
if [[ "${pkg_dir}" =~ .*testing.* ]];
257+
then
258+
echo "Do not build ${pkg_dir}";
259+
continue;
260+
fi
261+
echo "Building $pkg_dir"
262+
python -m build --outdir $PWD/dist $pkg_dir
263+
done
264+
- name: 'Upload Artifact'
265+
uses: actions/upload-artifact@v4
266+
with:
267+
name: gubbins-whl
268+
path: dist/*.whl
269+
retention-days: 5
270+
271+
# Build to docker image with the code in it
272+
docker-gubbins:
273+
needs:
274+
- deploy-pypi
275+
- build-gubbins-wheels
276+
if: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
277+
timeout-minutes: 30
278+
runs-on: ubuntu-latest
279+
steps:
280+
- name: Checkout
281+
uses: actions/checkout@v4
282+
- name: Set up QEMU
283+
uses: docker/setup-qemu-action@v3
284+
- name: Set up Docker Buildx
285+
uses: docker/setup-buildx-action@v3
286+
- name: Login to GitHub container registry
287+
uses: docker/login-action@v3
288+
with:
289+
registry: ghcr.io
290+
username: ${{ github.actor }}
291+
password: ${{ secrets.GITHUB_TOKEN }}
292+
- name: Download diracx wheels
293+
uses: actions/download-artifact@v4
294+
with:
295+
name: diracx-whl
296+
- name: Download gubbins wheels
297+
uses: actions/download-artifact@v4
298+
with:
299+
name: gubbins-whl
300+
- name: "Find wheels"
301+
id: find_wheel
302+
run: |
303+
# We need to copy them there to be able to access them in the RUN --mount
304+
cp diracx*.whl gubbins*.whl extensions/containers/client/
305+
cp diracx*.whl gubbins*.whl extensions/containers/services/
306+
for wheel_fn in *.whl; do
307+
pkg_name=$(basename "${wheel_fn}" | cut -d '-' -f 1)
308+
echo "${pkg_name}-wheel-name=$(ls "${pkg_name}"-*.whl)" >> $GITHUB_OUTPUT
309+
done
310+
311+
- name: Build and push client (dev)
312+
uses: docker/build-push-action@v6
313+
with:
314+
context: extensions/containers/client
315+
push: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
316+
tags: ghcr.io/diracgrid/gubbins/client:dev
317+
platforms: linux/amd64,linux/arm64
318+
- name: Build and push service (dev)
319+
uses: docker/build-push-action@v6
320+
with:
321+
context: extensions/containers/services
322+
push: ${{ needs.deploy-pypi.outputs.create-release == 'true' }}
323+
tags: ghcr.io/diracgrid/gubbins/services:dev
324+
platforms: linux/amd64,linux/arm64
325+
build-args: |
326+
EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration
327+
EXTENSION_CUSTOM_SOURCES_TO_INSTALL=/bindmount/gubbins_db*.whl,/bindmount/gubbins_logic*.whl,/bindmount/gubbins_routers*.whl,/bindmount/gubbins_client*.whl

‎.github/workflows/extensions.yml‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
- gubbins
87
pull_request:
98
branches:
109
- main
@@ -126,8 +125,16 @@ jobs:
126125
steps:
127126
- name: Checkout
128127
uses: actions/checkout@v4
128+
- name: Set up QEMU
129+
uses: docker/setup-qemu-action@v3
129130
- name: Set up Docker Buildx
130131
uses: docker/setup-buildx-action@v3
132+
- name: Login to GitHub container registry
133+
uses: docker/login-action@v3
134+
with:
135+
registry: ghcr.io
136+
username: ${{ github.actor }}
137+
password: ${{ secrets.GITHUB_TOKEN }}
131138
- name: Download gubbins wheels
132139
uses: actions/download-artifact@v4
133140
with:
@@ -145,37 +152,22 @@ jobs:
145152
uses: docker/build-push-action@v6
146153
with:
147154
context: extensions/containers/services
148-
tags: gubbins/services:dev
149-
outputs: type=docker,dest=/tmp/gubbins_services_image.tar
155+
tags: ghcr.io/diracgrid/gubbins/services:dev
156+
push: ${{ github.event_name != 'pull_request' && github.repository == 'DIRACGrid/diracx' && github.ref_name == 'main' }}
150157
build-args: |
151158
EXTRA_PACKAGES_TO_INSTALL=git+https://github.com/DIRACGrid/DIRAC.git@integration
152159
EXTENSION_CUSTOM_SOURCES_TO_INSTALL=/bindmount/gubbins_db*.whl,/bindmount/gubbins_logic*.whl,/bindmount/gubbins_routers*.whl,/bindmount/gubbins_client*.whl
153160
- name: Build and export client
154161
uses: docker/build-push-action@v6
155162
with:
156163
context: extensions/containers/client
157-
tags: gubbins/client:dev
158-
outputs: type=docker,dest=/tmp/gubbins_client_image.tar
159-
- name: Upload artifact
160-
uses: actions/upload-artifact@v4
161-
with:
162-
name: gubbins-services-img
163-
path: /tmp/gubbins_services_image.tar
164-
164+
tags: ghcr.io/diracgrid/gubbins/client:dev
165+
push: ${{ github.event_name != 'pull_request' && github.repository == 'DIRACGrid/diracx' && github.ref_name == 'main' }}
165166

166167
pytest-integration:
167168
needs: build-image
168169
runs-on: ubuntu-latest
169170
steps:
170-
- name: Download gubbins-image
171-
uses: actions/download-artifact@v4
172-
with:
173-
name: gubbins-services-img
174-
path: /tmp
175-
- name: Load image
176-
run: |
177-
docker load --input /tmp/gubbins_services_image.tar
178-
docker image ls -a
179171
- name: Checkout code
180172
uses: actions/checkout@v4
181173
- uses: mamba-org/setup-micromamba@v2
@@ -199,7 +191,7 @@ jobs:
199191
sed -i 's@../..@.@g' /tmp/gubbins/pyproject.toml
200192
sed -i 's@../../@@g' /tmp/gubbins/gubbins-*/pyproject.toml
201193
git init /tmp/gubbins/
202-
../diracx-charts/run_demo.sh --enable-open-telemetry --enable-coverage --exit-when-done --set-value developer.autoReload=false --ci-values ../diracx-charts/demo/ci_values.yaml --ci-values ./extensions/gubbins_values.yaml --load-docker-image "gubbins/services:dev" $PWD /tmp/gubbins/
194+
../diracx-charts/run_demo.sh --enable-open-telemetry --enable-coverage --exit-when-done --set-value developer.autoReload=false --ci-values ../diracx-charts/demo/ci_values.yaml --ci-values ./extensions/gubbins_values.yaml $PWD /tmp/gubbins/
203195
- name: Debugging information
204196
run: |
205197
DIRACX_DEMO_DIR=$PWD/../diracx-charts/.demo

‎extensions/gubbins_values.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
# values specific to testing gubbins
22
global:
3-
# Needed to be able to force pre-load the image in kind
4-
# see https://kind.sigs.k8s.io/docs/user/quick-start/#loading-an-image-into-your-cluster
5-
# and https://iximiuz.com/en/posts/kubernetes-kind-load-docker-image/
6-
imagePullPolicy: IfNotPresent
3+
imagePullPolicy: Always
74
images:
8-
services: gubbins/services
5+
tag: dev
6+
services: ghcr.io/diracgrid/gubbins/services
97

108
developer:
119
enabled: true

0 commit comments

Comments
 (0)