Skip to content

Commit

Permalink
Merge branch 'tickets/DM-48903'
Browse files Browse the repository at this point in the history
  • Loading branch information
@fritzm
fritzm committed Feb 13, 2025
2 parents 7c2e4cb + 5092b29 commit 3869bd8
Show file tree
Hide file tree
Showing 13 changed files with 141 additions and 248 deletions.
104 changes: 23 additions & 81 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# could change from job to job, breaking the running workflow in a difficult
# to understand way.
name: Save image names
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
outputs:
build-image: ${{ steps.image-names.outputs.build-image }}
user-build-image: ${{ steps.image-names.outputs.user-build-image }}
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
update-base-images:
name: Update base images
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: image-names
outputs:
build-rebuilt: ${{ steps.rebuild.outputs.build-rebuilt }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:

update-mariadb-image:
name: Update MariaDB image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: image-names
outputs:
rebuilt: ${{ steps.rebuild.outputs.rebuilt }}
Expand Down Expand Up @@ -163,67 +163,9 @@ jobs:
QSERV_DH_USER: ${{ secrets.FM_DOCKERHUB_TOKEN_USER }}
QSERV_DH_TOKEN: ${{ secrets.FM_DOCKERHUB_TOKEN }}

documentation:
name: Documentation
runs-on: ubuntu-20.04
needs: [image-names, update-base-images]
if: false # Disable old documentation workflow pending migration to new one
steps:

- name: Install python
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Install click
run: |
python -m pip install --upgrade pip
pip install click pyyaml requests
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: true
fetch-depth: 0 # 0 is "all history and branch tags"

- name: Check for changes
uses: dorny/paths-filter@v3
id: filter
with:
filters: |
docs:
- 'doc/**'
- name: Prepare user build image
if: needs.update-base-images.outputs.build-rebuilt == 'True' || steps.filter.outputs.docs == 'true'
run: |
./admin/local/cli/qserv --log-level DEBUG build-user-build-image \
--group docker_outer \
--build-image ${{ needs.image-names.outputs.build-image }} \
--user-build-image ${{ needs.image-names.outputs.user-build-image }}
- name: Build docs
if: needs.update-base-images.outputs.build-rebuilt == 'True' || steps.filter.outputs.docs == 'true'
run: |
./admin/local/cli/qserv build-docs --cmake --linkcheck \
--user-build-image ${{ needs.image-names.outputs.user-build-image }}
env:
QSERV_GH_EVENT_NAME: ${{ github.event_name }}
QSERV_GH_HEAD_REF: ${{ github.head_ref }}
QSERV_GH_REF: ${{ github.ref }}

- name: Upload to LSST the Docs
if: needs.update-base-images.outputs.build-rebuilt == 'True' || steps.filter.outputs.docs == 'true'
uses: lsst-sqre/ltd-upload@v1
with:
project: "Qserv"
dir: "build/doc/html"
username: ${{ secrets.LTD_USERNAME }}
password: ${{ secrets.LTD_PASSWORD }}

update-run-image:
name: Update Qserv image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [image-names, update-base-images]
steps:

Expand Down Expand Up @@ -275,7 +217,7 @@ jobs:

compose-integration-tests:
name: Integration tests (compose)
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
needs: [image-names, update-mariadb-image, update-run-image]
steps:

Expand Down Expand Up @@ -337,67 +279,67 @@ jobs:

- name: Replication Controller Log
if: always()
run: docker logs ${USER}_repl_controller_1
run: docker logs ${USER}-repl-controller-1

- name: Replication Registry Log
if: always()
run: docker logs ${USER}_repl_registry_1
run: docker logs ${USER}-repl-registry-1

- name: Replication Database Log
if: always()
run: docker logs ${USER}_repl_mariadb_1
run: docker logs ${USER}-repl-mariadb-1

- name: Replication Worker 0 Log
if: always()
run: docker logs ${USER}_repl_worker_0_1
run: docker logs ${USER}-repl-worker-0-1

- name: Replication Worker 1 Log
if: always()
run: docker logs ${USER}_repl_worker_1_1
run: docker logs ${USER}-repl-worker-1-1

- name: Czar MySQL Proxy Log
if: always()
run: docker logs ${USER}_czar_proxy_1
run: docker logs ${USER}-czar-proxy-1

- name: Czar HTTP Frontend Log
if: always()
run: docker logs ${USER}_czar_http_1
run: docker logs ${USER}-czar-http-1

- name: Czar CMSD Log
if: always()
run: docker logs ${USER}_czar_cmsd_1
run: docker logs ${USER}-czar-cmsd-1

- name: Czar XROOTD Log
if: always()
run: docker logs ${USER}_czar_xrootd_1
run: docker logs ${USER}-czar-xrootd-1

- name: Czar MariaDB Log
if: always()
run: docker logs ${USER}_czar_mariadb_1
run: docker logs ${USER}-czar-mariadb-1

- name: Qzerv Worker 0 CMSD Log
if: always()
run: docker logs ${USER}_worker_cmsd_0_1
run: docker logs ${USER}-worker-cmsd-0-1

- name: Qzerv Worker 0 XROOTD Log
if: always()
run: docker logs ${USER}_worker_xrootd_0_1
run: docker logs ${USER}-worker-xrootd-0-1

- name: Qzerv Worker 0 MariaDB Log
if: always()
run: docker logs ${USER}_worker_mariadb_0_1
run: docker logs ${USER}-worker-mariadb-0-1

- name: Qzerv Worker 1 CMSD Log
if: always()
run: docker logs ${USER}_worker_cmsd_1_1
run: docker logs ${USER}-worker-cmsd-1-1

- name: Qzerv Worker 1 XROOTD Log
if: always()
run: docker logs ${USER}_worker_xrootd_1_1
run: docker logs ${USER}-worker-xrootd-1-1

- name: Qzerv Worker 1 MariaDB Log
if: always()
run: docker logs ${USER}_worker_mariadb_1_1
run: docker logs ${USER}-worker-mariadb-1-1

- name: Remove integration test volumes
run: |
Expand All @@ -410,8 +352,8 @@ jobs:
notify-on-fail:
name: Notify Slack if fail on main
runs-on: ubuntu-20.04
needs: [documentation, compose-integration-tests]
runs-on: ubuntu-22.04
needs: [compose-integration-tests]
if: github.ref == 'refs/heads/main' && failure()
steps:
- name: Notify
Expand Down
Loading

0 comments on commit 3869bd8

Please sign in to comment.