Skip to content

Commit c4fb34c

Browse files
tuntojajeremyjaouenzguennoune02adr-mosc979
authored
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>
1 parent b17bf6f commit c4fb34c

6 files changed

Lines changed: 12 additions & 4 deletions

File tree

widgets/centreon-widget-host-monitoring/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ try {
147147
dir('centreon-widget-host-monitoring') {
148148
checkout scm
149149
}
150-
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'
150+
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'
151151
stash name: 'Debian11', includes: '*.deb'
152152
archiveArtifacts artifacts: "*.deb"
153153
}

widgets/centreon-widget-host-monitoring/ci/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Package: centreon-widget-host-monitoring
1010
Architecture: all
1111
Depends: ${misc:Depends},
1212
${shlibs:Depends},
13-
centreon-web
13+
centreon-web (>= ${centreon:version}~)
1414
Description: Add homepage with Centreon Widgets
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
host-monitoring usr/share/centreon/www/widgets
1+
host-monitoring usr/share/centreon/www/widgets
2+
3+

widgets/centreon-widget-host-monitoring/ci/debian/rules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
44

55
%:
66
dh $@
7+
8+
override_dh_gencontrol:
9+
dh_gencontrol -- -Tdebian/substvars
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
centreon:version=

widgets/centreon-widget-host-monitoring/ci/scripts/widget-deb-package.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ mkdir -p /build/$PROJECT
2323
(cd /src && tar czvpf - $PROJECT) | dd of=$PROJECT-$VERSION.tar.gz
2424
cp -rv /src/$PROJECT /build/
2525
cp -rv /src/$PROJECT/ci/debian /build/$PROJECT/
26+
sed -i "s/^centreon:version=.*$/centreon:version=$(echo $VERSION | egrep -o '^[0-9][0-9].[0-9][0-9]')/" /build/$PROJECT/debian/substvars
2627

2728
ls -lart
2829
cd /build/$PROJECT
29-
debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -y -r "$RELEASE"
30+
debmake -f "${AUTHOR}" -e "${AUTHOR_EMAIL}" -u "$VERSION" -y -r "$DISTRIB"
31+
3032
debuild-pbuilder
3133
cd /build
3234

0 commit comments

Comments
 (0)