Rebase dev 22.04.x onto 22.04.x (centreon#147)

* chore(php version): fix warning (centreon#112) * new workflow * hotfixing jenkinsfile * fix(comments): display correctly last comments (centreon#115) * enh(chore): automate dependabot ticket creation (centreon#116) * fix(chore): old dependabot's PR ticket creation (centreon#117) * enh(feature-switch): fully manage feature switch (centreon#114) * enh(feature-switch): fully manage feature switch * fix(index): wrong variable used * fix qabranch variable * enh(chore): issueType, feature_team and issue description * chore(version): prepare 22.04 serie (centreon#120) * chore(version): prepare 22.04 serie * Update Jenkinsfile * fix(secu): add SQ pipeline timeout (centreon#128) * fix(chore): use github action env usage (centreon#129) * fix(build): disable centos8 packaging (centreon#130) * fix(chore): dependabot github automation (centreon#131) * alma8 enabled (centreon#132) * feat(ui): Apply dark mode for widget host monitoring (centreon#136) * fix(css): fix ccs import (centreon#138) * chore(version): prepare 22.04.next (centreon#140) * Merge release-debian-22.04.0 into 22.04.x (centreon#145) * fix debian * Update Jenkinsfile * Update Jenkinsfile * add version check version of dependency and remove unused file Co-authored-by: Zakaria GUENNOUNE <zguennoune@centreon.com> Co-authored-by: Luiz Costa <me@luizgustavo.pro.br> * enh(secu): update GPG key (centreon#126) * fix(secu): change fingerprint key (centreon#127) * Add configuration to build DEB package (centreon#137) * add deb package * fix project name * fix package name * fix package name * add delivery * fix : Issue with cross databases query when the name contains some characters (centreon#144) Co-authored-by: jeremyjaouen <61694165+jeremyjaouen@users.noreply.github.com> Co-authored-by: Zakaria Guennoune <zguennoune@centreon.com> Co-authored-by: Adrien Morais <31647811+adr-mo@users.noreply.github.com> Co-authored-by: sc979 <34628915+sc979@users.noreply.github.com> Co-authored-by: schapron <schapron@centreon.com> Co-authored-by: Charles Gautier <33026375+chgautier@users.noreply.github.com> Co-authored-by: ataghzout <97593248+ataghzout@users.noreply.github.com> Co-authored-by: Laurent Pinsivy <lpinsivy@centreon.com> Co-authored-by: Luiz Costa <me@luizgustavo.pro.br> Co-authored-by: Zakaria Guennoune <83596451+zguennoune02@users.noreply.github.com> Co-authored-by: hyahiaoui-ext <97593234+hyahiaoui-ext@users.noreply.github.com>
sc979 · Jul 21, 2022 · c4fb34c · c4fb34c
1 parent b17bf6f
commit c4fb34c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/widgets/centreon-widget-host-monitoring/Jenkinsfile b/widgets/centreon-widget-host-monitoring/Jenkinsfile
@@ -147,7 +147,7 @@ try {
         dir('centreon-widget-host-monitoring') {
           checkout scm
         }
-        sh 'docker run -i --entrypoint "/src/centreon-widget-host-monitoring/ci/scripts/widget-deb-package.sh" -w "/src" -v "$PWD:/src" -e "DISTRIB=Debian11" -e "VERSION=$VERSION" -e "RELEASE=$RELEASE" registry.centreon.com/centreon-debian11-dependencies:22.04'
+        sh 'docker run -i --entrypoint "/src/centreon-widget-host-monitoring/ci/scripts/widget-deb-package.sh" -w "/src" -v "$PWD:/src" -e "DISTRIB=bullseye" -e "VERSION=$VERSION" -e "RELEASE=$RELEASE" registry.centreon.com/centreon-debian11-dependencies:22.04'
         stash name: 'Debian11', includes: '*.deb'
         archiveArtifacts artifacts: "*.deb"
       }

diff --git a/widgets/centreon-widget-host-monitoring/ci/debian/control b/widgets/centreon-widget-host-monitoring/ci/debian/control
@@ -10,5 +10,5 @@ Package: centreon-widget-host-monitoring
 Architecture: all
 Depends:    ${misc:Depends},
             ${shlibs:Depends},
-            centreon-web
+            centreon-web (>= ${centreon:version}~)
 Description: Add homepage with Centreon Widgets
diff --git a/widgets/centreon-widget-host-monitoring/ci/debian/install b/widgets/centreon-widget-host-monitoring/ci/debian/install
@@ -1 +1,3 @@
-host-monitoring   usr/share/centreon/www/widgets
+host-monitoring   usr/share/centreon/www/widgets
+
+
diff --git a/widgets/centreon-widget-host-monitoring/ci/debian/rules b/widgets/centreon-widget-host-monitoring/ci/debian/rules
@@ -4,3 +4,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
+
+override_dh_gencontrol:
+	dh_gencontrol -- -Tdebian/substvars
diff --git a/widgets/centreon-widget-host-monitoring/ci/debian/substvars b/widgets/centreon-widget-host-monitoring/ci/debian/substvars
@@ -0,0 +1 @@
+centreon:version=
diff --git a/widgets/centreon-widget-host-monitoring/ci/scripts/widget-deb-package.sh b/widgets/centreon-widget-host-monitoring/ci/scripts/widget-deb-package.sh
@@ -23,10 +23,12 @@ mkdir -p /build/$PROJECT
 (cd /src && tar czvpf - $PROJECT) | dd of=$PROJECT-$VERSION.tar.gz
 cp -rv /src/$PROJECT /build/
 cp -rv /src/$PROJECT/ci/debian /build/$PROJECT/
+sed -i "s/^centreon:version=.*$/centreon:version=$(echo $VERSION | egrep -o '^[0-9][0-9].[0-9][0-9]')/" /build/$PROJECT/debian/substvars
 
 ls -lart
 cd /build/$PROJECT
-debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -y -r "$RELEASE"
+debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -y -r "$DISTRIB"
+
 debuild-pbuilder
 cd /build