Skip to content

Commit

Permalink
chore(release): bump major to 24.10 (#1729)
Browse files Browse the repository at this point in the history
* chore(release): bump major to 24.10

* chore(release): bump major to 24.10

* disable gorgone tests to allow first batch of unstable collect packages

* disable gorgone tests to allow first batch of unstable collect packages 2

* disable bullseye from matrix

* disable bullseye from matrix 2

* fix(ci): retrieve gorgone tests

* fix(ci): update gorgone tests according to packaging distrib change

* fix(ci): disable gorgone tests

* Revert forced unstable stability on get-version

* uncomment gorgone tests

---------

Co-authored-by: Kevin Duret <[email protected]>
  • Loading branch information
2 people authored and bouda1 committed Oct 3, 2024
1 parent 9117d77 commit 63e9663
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 71 deletions.
25 changes: 2 additions & 23 deletions .github/workflows/centreon-collect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [alma8, alma9, debian-bullseye, debian-bookworm]
distrib: [alma8, alma9, debian-bookworm]

runs-on: [self-hosted, collect]

Expand Down Expand Up @@ -255,11 +255,6 @@ jobs:
package_extension: rpm
runner: collect
arch: amd64
- image: centreon-collect-debian-bullseye
distrib: bullseye
package_extension: deb
runner: collect
arch: amd64
- image: centreon-collect-debian-bookworm
distrib: bookworm
package_extension: deb
Expand All @@ -270,11 +265,6 @@ jobs:
package_extension: deb
runner: collect
arch: amd64
- image: centreon-collect-debian-bullseye-arm64
distrib: bullseye
package_extension: deb
runner: collect-arm64
arch: arm64
- image: centreon-collect-debian-bookworm-arm64
distrib: bookworm
package_extension: deb
Expand Down Expand Up @@ -324,13 +314,6 @@ jobs:
database_type: mysql
test_group_name: robot_test-mysql-el9-amd64
tests_params: '{}'
- distrib: bullseye
image: centreon-collect-debian-bullseye-arm64-test
package_extension: deb
arch: arm64
database_type: mariadb
test_group_name: robot_test-mariadb-bullseye-arm64
tests_params: '{}'
- distrib: bookworm
image: centreon-collect-debian-bookworm-arm64-test
package_extension: deb
Expand Down Expand Up @@ -448,10 +431,6 @@ jobs:
strategy:
matrix:
include:
- distrib: bullseye
arch: amd64
- distrib: bullseye
arch: arm64
- distrib: bookworm
arch: amd64
- distrib: jammy
Expand Down Expand Up @@ -485,7 +464,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-gorgone-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

strategy:
matrix:
distrib: [alma8, alma9, bullseye, bookworm, jammy]
distrib: [alma8, alma9, bookworm, jammy]
steps:
- name: Checkout sources
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/gorgone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,14 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, bookworm, jammy]
include:
- package_extension: rpm
image: packaging-nfpm-alma8
distrib: el8
- package_extension: rpm
image: packaging-nfpm-alma9
distrib: el9
- package_extension: deb
image: packaging-nfpm-bullseye
distrib: bullseye
- package_extension: deb
image: packaging-nfpm-bookworm
distrib: bookworm
Expand Down Expand Up @@ -139,17 +136,14 @@ jobs:
strategy:
fail-fast: false
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, bookworm, jammy]
include:
- package_extension: rpm
image: gorgone-testing-alma8
distrib: el8
- package_extension: rpm
image: gorgone-testing-alma9
distrib: el9
- package_extension: deb
image: gorgone-testing-bullseye
distrib: bullseye
- package_extension: deb
image: gorgone-testing-jammy
distrib: jammy
Expand Down Expand Up @@ -208,14 +202,20 @@ jobs:
key: ${{ github.sha }}-${{ github.run_id }}-${{ matrix.package_extension }}-${{ matrix.distrib }}
fail-on-cache-miss: true

- name: Install gorgogne from just built package
- name: Parse distrib name
id: parse-distrib
uses: ./.github/actions/parse-distrib
with:
distrib: ${{ matrix.distrib }}

- name: Install gorgone from just built package
shell: bash
run: |
if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
apt update
apt install -y ./centreon-gorgone*${{ matrix.distrib }}*
apt install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}*
else
dnf install -y ./centreon-gorgone*${{ matrix.distrib }}* ./centreon-gorgone-centreon-config*${{ matrix.distrib }}*
dnf install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}* ./centreon-gorgone-centreon-config*${{ steps.parse-distrib.outputs.package_distrib_name }}*
# in el8 at least, there is a package for the configuration and a package for the actual code.
# this is not the case for debian, and for now I don't know why it was made any different between the 2 Os.
fi
Expand Down Expand Up @@ -294,7 +294,7 @@ jobs:

strategy:
matrix:
distrib: [bullseye, bookworm, jammy]
distrib: [bookworm, jammy]

steps:
- name: Checkout sources
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bookworm]

steps:
- name: Checkout sources
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/libzmq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ jobs:
fail-fast: false
matrix:
include:
- image: packaging-nfpm-bullseye
distrib: bullseye
runner: ubuntu-22.04
arch: amd64
- image: packaging-nfpm-bookworm
distrib: bookworm
runner: ubuntu-22.04
Expand All @@ -91,10 +87,6 @@ jobs:
distrib: jammy
runner: ubuntu-22.04
arch: amd64
- image: packaging-bullseye-arm64
distrib: bullseye
runner: ["self-hosted", "collect-arm64"]
arch: arm64

runs-on: ${{ matrix.runner }}

Expand Down Expand Up @@ -184,10 +176,6 @@ jobs:
strategy:
matrix:
include:
- distrib: bullseye
arch: amd64
- distrib: bullseye
arch: arm64
- distrib: bookworm
arch: amd64
- distrib: jammy
Expand Down Expand Up @@ -221,7 +209,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm, jammy]
distrib: [el8, el9, bookworm, jammy]

steps:
- name: Checkout sources
Expand Down
18 changes: 1 addition & 17 deletions .github/workflows/lua-curl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,6 @@ jobs:
lua_version: 5.4
runner: ubuntu-24.04
arch: amd64
- package_extension: deb
image: centreon-collect-debian-bullseye
distrib: bullseye
lua_version: 5.3
runner: ubuntu-24.04
arch: amd64
- package_extension: deb
image: centreon-collect-debian-bookworm
distrib: bookworm
Expand All @@ -65,12 +59,6 @@ jobs:
lua_version: 5.3
runner: ubuntu-24.04
arch: amd64
- package_extension: deb
image: centreon-collect-debian-bullseye-arm64
distrib: bullseye
lua_version: 5.3
runner: ["self-hosted", "collect-arm64"]
arch: arm64
- package_extension: deb
image: centreon-collect-debian-bookworm-arm64
distrib: bookworm
Expand Down Expand Up @@ -176,10 +164,6 @@ jobs:
strategy:
matrix:
include:
- distrib: bullseye
arch: amd64
- distrib: bullseye
arch: arm64
- distrib: bookworm
arch: amd64
- distrib: jammy
Expand Down Expand Up @@ -212,7 +196,7 @@ jobs:
runs-on: [self-hosted, common]
strategy:
matrix:
distrib: [el8, el9, bullseye, bookworm]
distrib: [el8, el9, bookworm]

steps:
- name: Checkout sources
Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MAJOR=24.09
MAJOR=24.10
MINOR=0
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ endif()

# Version.
set(COLLECT_MAJOR 24)
set(COLLECT_MINOR 09)
set(COLLECT_MINOR 10)
set(COLLECT_PATCH 0)
set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")

Expand Down
4 changes: 2 additions & 2 deletions gorgone/packaging/centreon-gorgone-centreon-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ overrides:
depends:
- centreon-gorgone (= ${VERSION}-${RELEASE}${DIST})
replaces:
- centreon-gorgone (<< 24.09.0)
- centreon-gorgone (<< 24.10.0)

deb:
breaks:
- centreon-gorgone (<< 24.09.0)
- centreon-gorgone (<< 24.10.0)

rpm:
summary: Configure Centreon Gorgone for use with Centreon Web
Expand Down

0 comments on commit 63e9663

Please sign in to comment.