Skip to content

Commit

Permalink
Backport: github: try to use more customized labels (LTS) (#720)
Browse files Browse the repository at this point in the history
Currently, it is bit hard to distinct each Test jobs on
fluent-package-builder/actions/runs page.

This is because Test (CGroup V1) matrix.label matrix.test-file is shown
by default.

This commit try to make it more visibility on that page.


ref. #684

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
  • Loading branch information
kenhys authored Nov 8, 2024
1 parent 61b0767 commit 93aabd3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
fail-fast: false
matrix:
label:
- Debian GNU/Linux bullseye amd64
- Debian GNU/Linux bookworm amd64
- Debian bullseye amd64
- Debian bookworm amd64
- Ubuntu Focal amd64
- Ubuntu Jammy amd64
- Ubuntu Noble amd64
include:
- label: Debian GNU/Linux bullseye amd64
- label: Debian bullseye amd64
rake-job: debian-bullseye
test-docker-image: debian:bullseye
- label: Debian GNU/Linux bookworm amd64
- label: Debian bookworm amd64
rake-job: debian-bookworm
test-docker-image: debian:bookworm
- label: Ubuntu Focal amd64
Expand Down Expand Up @@ -112,16 +112,16 @@ jobs:
${{ matrix.test-docker-image }} \
/fluentd/fluent-package/apt/binstubs-test.sh
test:
name: Test
name: Test ${{ matrix.label }} ${{ matrix.test-file }}
needs: build
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
label:
- Debian GNU/Linux bullseye amd64
- Debian GNU/Linux bookworm amd64
- Debian bullseye amd64
- Debian bookworm amd64
- Ubuntu Focal amd64
- Ubuntu Jammy amd64
- Ubuntu Noble amd64
Expand All @@ -133,10 +133,10 @@ jobs:
- "install-newly.sh v5"
- "install-newly.sh lts"
include:
- label: Debian GNU/Linux bullseye amd64
- label: Debian bullseye amd64
rake-job: debian-bullseye
test-lxc-image: images:debian/11
- label: Debian GNU/Linux bookworm amd64
- label: Debian bookworm amd64
rake-job: debian-bookworm
test-lxc-image: images:debian/12
- label: Ubuntu Focal amd64
Expand All @@ -149,11 +149,11 @@ jobs:
rake-job: ubuntu-noble
test-lxc-image: ubuntu:24.04
exclude:
- label: Debian GNU/Linux bookworm amd64
- label: Debian bookworm amd64
test-file: update-from-v4.sh
- label: Debian GNU/Linux bookworm amd64
- label: Debian bookworm amd64
test-file: update-to-next-version-with-backward-compat-for-v4.sh
- label: Debian GNU/Linux bookworm amd64
- label: Debian bookworm amd64
test-file: downgrade-to-v4.sh
- label: Ubuntu Noble amd64
test-file: update-from-v4.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/yum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
${{ matrix.test-docker-image }} \
/fluentd/fluent-package/yum/binstubs-test.sh
v1test:
name: Test (CGroup V1)
name: Test ${{ matrix.label }} ${{ matrix.test-file }} (CGroup V1)
needs: build
runs-on: ubuntu-20.04
timeout-minutes: 15
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
run: fluent-package/yum/systemd-test/test.sh ${{ matrix.test-lxc-image }} ${{ matrix.test-file }}

v2test:
name: Test (CGroup V2)
name: Test ${{ matrix.label }} ${{ matrix.test-file }} (CGroup V2)
needs: build
runs-on: ubuntu-latest
timeout-minutes: 15
Expand Down

0 comments on commit 93aabd3

Please sign in to comment.