Skip to content

chore(packaging): refactor dep graph — break broker/engine cycles and verticalize gorgone #3437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tpo76 wants to merge 1 commit into
base: develop
Choose a base branch
from
+2 −20
Draft

chore(packaging): refactor dep graph — break broker/engine cycles and verticalize gorgone #3437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions gorgone/packaging/centreon-gorgone-centreon-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,9 @@ scripts:
overrides:
rpm:
depends:
- centreon-gorgone = ${VERSION}-${RELEASE}${DIST}
- centreon-common
deb:
depends:
- centreon-gorgone (= ${VERSION}-${RELEASE}${DIST})
- centreon-common
replaces:
- centreon-gorgone (<< 24.11.0)
Expand Down
2 changes: 2 additions & 0 deletions gorgone/packaging/centreon-gorgone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ overrides:
rpm:
depends:
- centreon-perl-libs-common
- centreon-gorgone-centreon-config = ${VERSION}-${RELEASE}${DIST}
- bzip2
- initscripts
- perl-Libssh-Session >= 0.8
Expand Down Expand Up @@ -204,6 +205,7 @@ overrides:
deb:
depends: # those dependencies are taken from centreon-gorgone/packaging/debian/control
- centreon-perl-libs-common
- centreon-gorgone-centreon-config (= ${VERSION}-${RELEASE}${DIST})
- libdatetime-perl
- libtime-parsedate-perl
- libtry-tiny-perl
Expand Down
6 changes: 0 additions & 6 deletions packaging/centreon-collect/centreon-broker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,13 @@ scripts:

overrides:
rpm:
depends:
- centreon-clib = ${VERSION}-${RELEASE}${DIST}
- centreon-broker-core = ${VERSION}-${RELEASE}${DIST}
conflicts:
- centreon-broker-devel
replaces:
- centreon-broker-devel
provides:
- centreon-broker-devel
deb:
depends:
- centreon-clib (= ${VERSION}-${RELEASE}${DIST})
- centreon-broker-core (= ${VERSION}-${RELEASE}${DIST})
conflicts:
- centreon-broker-dev
replaces:
Expand Down
4 changes: 0 additions & 4 deletions packaging/centreon-collect/centreon-engine-daemon.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ overrides:
rpm:
depends:
- centreon-clib = ${VERSION}-${RELEASE}${DIST}
- centreon-engine = ${VERSION}-${RELEASE}${DIST}
- centreon-engine-opentelemetry = ${VERSION}-${RELEASE}${DIST}
- gnutls >= 3.6.0
- mariadb-connector-c >= 3.1.10
conflicts:
Expand All @@ -173,8 +171,6 @@ overrides:
deb:
depends:
- centreon-clib (= ${VERSION}-${RELEASE}${DIST})
- centreon-engine (= ${VERSION}-${RELEASE}${DIST})
- centreon-engine-opentelemetry (= ${VERSION}-${RELEASE}${DIST})
- libgnutls30
- libssl1.1 | libssl3
- libmariadb3
Expand Down
8 changes: 0 additions & 8 deletions packaging/centreon-common/centreon-common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,9 @@ scripts:
overrides:
rpm:
depends:
- centreon-broker >= ${MAJOR_VERSION}
- centreon-broker < ${NEXT_MAJOR_VERSION}
- centreon-engine-daemon >= ${MAJOR_VERSION}
- centreon-engine-daemon < ${NEXT_MAJOR_VERSION}
- sudo
deb:
depends:
- "centreon-broker (>= ${MAJOR_VERSION}~)"
- "centreon-broker (<< ${NEXT_MAJOR_VERSION}~)"
- "centreon-engine-daemon (>= ${MAJOR_VERSION}~)"
- "centreon-engine-daemon (<< ${NEXT_MAJOR_VERSION}~)"
- sudo

rpm:
Expand Down
Loading