Revert "fix(gorgone): move centreon-common dependency (#1792)"

This reverts commit 6bffffc.
centreon · Nov 6, 2024 · 1086130 · 1086130
1 parent ad18f13
commit 1086130
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,15 +1,14 @@
 *                              @centreon/owners-cpp
 
-*.pm                           @centreon/owners-perl
-*.pl                           @centreon/owners-perl
-
-gorgone/                       @centreon/owners-perl
-gorgone/docs/                  @centreon/owners-doc
-
 .github/**                     @centreon/owners-pipelines
-**/packaging/**                @centreon/owners-pipelines
-**/selinux/**                  @centreon/owners-pipelines
+packaging/**                   @centreon/owners-pipelines
+selinux/**                     @centreon/owners-pipelines
 
 tests/**                       @centreon/owners-robot-e2e
 
+gorgone/                       @centreon/owners-perl
+gorgone/docs/                  @centreon/owners-doc
+
 gorgone/tests/robot/config/    @centreon/owners-perl
+*.pm                           @centreon/owners-perl
+*.pl                           @centreon/owners-perl
diff --git a/.github/workflows/gorgone.yml b/.github/workflows/gorgone.yml
@@ -214,9 +214,11 @@ jobs:
         run: |
           if [[ "${{ matrix.package_extension }}" == "deb" ]]; then
             apt update
-            apt install -y ./centreon-gorgone*.deb
+            apt install -y ./centreon-gorgone*${{ steps.parse-distrib.outputs.package_distrib_name }}*
           else
-            dnf install -y ./centreon-gorgone*.rpm
+            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
 
       - name: Create databases

diff --git a/gorgone/packaging/centreon-gorgone-centreon-config.yaml b/gorgone/packaging/centreon-gorgone-centreon-config.yaml
@@ -53,11 +53,9 @@ 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)
 

diff --git a/gorgone/packaging/centreon-gorgone.yaml b/gorgone/packaging/centreon-gorgone.yaml
@@ -156,6 +156,7 @@ scripts:
 overrides:
   rpm:
     depends:
+      - centreon-common
       - bzip2
       - perl-Libssh-Session >= 0.8
       - perl-CryptX
@@ -193,7 +194,8 @@ overrides:
       - perl(lib)
       - perl(Safe)
   deb:
-    depends:
+    depends:   # those dependencies are taken from centreon-gorgone/packaging/debian/control
+      - centreon-common
       - libdatetime-perl
       - libtime-parsedate-perl
       - libtry-tiny-perl