From dbaa7c1c9da7697ccf84028d3966a2c1ff99dd05 Mon Sep 17 00:00:00 2001 From: David Boucher Date: Mon, 13 Jun 2022 17:16:07 +0200 Subject: [PATCH 01/11] enh(broker/mysql_connection): unix socket is different on Debian or on centos7 REFS: MON-13926 --- CHANGELOG.md | 60 +++++++++++++++++++++++++++++- CMakeLists.txt | 32 ++++++++++++++++ broker/CMakeLists.txt | 32 ++++++---------- broker/core/src/database_config.cc | 2 +- engine/CMakeLists.txt | 16 -------- 5 files changed, 104 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14cf2daf428..b73efe9f0d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,4 +10,62 @@ Waiting longer for conflict manager to be connected *tls* -Printing encrypted write log on trace level only +*stream gRPC* + +A gRPC stream connector did not stop correctly on cbd stop. + +*BAM* + +On BAM misconfiguration, cbd could crash. This is fixed now. That was due to +an issue in mysql code with promises handling. + +*Debian* + +Default configuration files were not installed on a Debian fresh install. + +*unified_sql* + +tags are well removed now. + +Columns notes, notes\_url and action\_url are resized. + +*Debian* + +Default configuration files were not installed on a Debian fresh install. + +*GRPC stream* + +Don't coredump if connection fail on process start + +#### Enhancements + +*downtimes* + +They are inserted in bulk now. + +*sql* + +The mysql socket is defined with: +* /var/run/mysqld/mysqld.sock on Debian and similar distribs +* /var/lib/mysql/mysql.sock on RH and similar distribs +* /tmp/mysql.sock on others + +### Clib + +#### Fixes + +*Debian* + +Packaging did not follow Debian good practices. + +### Engine + +#### Enhancements + +*comments* + +They are sent only once to broker. + +*multiline passive checks* + +Escaped characters were not unescaped and we could not get them back. diff --git a/CMakeLists.txt b/CMakeLists.txt index 05916181996..29314af87d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,38 @@ set(ALLOW_DUPLICATE_EXECUTABLE TRUE) set(BUILD_ARGS "-w" "dupbuild=warn") +# +# Get distributions name +# +if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + file(STRINGS "/etc/os-release" release + REGEX "^ID") + foreach (l ${release}) + if (${l} MATCHES "ID_LIKE=.*") + string(REGEX REPLACE "ID_LIKE=\"(.*)\"" "\\1" like ${l}) + endif () + + if (${l} MATCHES "ID=.*") + string(REGEX REPLACE "ID=\"(.*)\"" "\\1" id ${l}) + endif () + endforeach () + string(TOLOWER "${like}" like) + string(TOLOWER "${id}" id) + + if (("${id}" MATCHES "debian") OR ("${like}" MATCHES "debian") OR ("${id}" MATCHES "ubuntu") OR ("${like}" MATCHES "ubuntu")) + set(OS_DISTRIBUTOR "Debian") + elseif (("${id}" MATCHES "centos") OR ("${like}" MATCHES "centos")) + set(OS_DISTRIBUTOR "CentOS") + else () + message(WARNING "lsb_release in not installed") + set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") + endif () +else () + set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") +endif () + +message(STATUS "${id} detected (compatible with ${OS_DISTRIBUTOR})") + # set -latomic if OS is Raspbian. if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm") set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic") diff --git a/broker/CMakeLists.txt b/broker/CMakeLists.txt index f5a17b08e2a..d2b57f28258 100644 --- a/broker/CMakeLists.txt +++ b/broker/CMakeLists.txt @@ -52,6 +52,18 @@ if (WITH_ASAN) set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") endif () +# Default MySQL socket +if (OS_DISTRIBUTOR STREQUAL "Debian" OR OS_DISTRIBUTOR STREQUAL "Ubuntu") + message(STATUS "deb based os") + add_definitions("-DMYSQL_SOCKET=\"/var/run/mysqld/mysqld.sock\"") +elseif (OS_DISTRIBUTOR STREQUAL "CentOS" OR OS_DISTRIBUTOR STREQUAL "RedHat") + message(STATUS "rpm based os") + add_definitions("-DMYSQL_SOCKET=\"/var/lib/mysql/mysql.sock\"") +else () + message(STATUS "other os: ${OS_DISTRIBUTOR}") + add_definitions("-DMYSQL_SOCKET=/tmp/mysql.sock") +endif () + include_directories("${PROJECT_SOURCE_DIR}/core/inc") include_directories("${PROJECT_SOURCE_DIR}/neb/inc") include_directories("${CMAKE_SOURCE_DIR}/engine/inc") @@ -126,26 +138,6 @@ include(cmake/tool.cmake) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") add_definitions("-DASIO_STANDALONE") -# -# Get distributions name -# -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - message(STATUS "Attempting to determine OS distributor.") - execute_process(COMMAND "lsb_release" "--short" "--id" - RESULT_VARIABLE RETCODE - OUTPUT_VARIABLE OS_DISTRIBUTOR - ERROR_QUIET) - if (RETCODE EQUAL 0) - string(REGEX REPLACE "\n$" "" OS_DISTRIBUTOR "${OS_DISTRIBUTOR}") - else () - message(WARNING "lsb_release in not installed") - set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") - endif () -elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") - set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") -endif () - - # # Options. # diff --git a/broker/core/src/database_config.cc b/broker/core/src/database_config.cc index fe473479483..71db83dc863 100644 --- a/broker/core/src/database_config.cc +++ b/broker/core/src/database_config.cc @@ -103,7 +103,7 @@ database_config::database_config(config::endpoint const& cfg) { if (it != end) _socket = it->second; else - _socket = "/var/lib/mysql/mysql.sock"; + _socket = MYSQL_SOCKET; } else _socket = ""; diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 6ee2692e406..98ae6a46ca8 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -195,22 +195,6 @@ else () set(GROUP "root") endif () -# Check OS distributor. -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - message(STATUS "Attempting to determine OS distributor.") - execute_process(COMMAND "lsb_release" "--short" "--id" - RESULT_VARIABLE RETCODE - OUTPUT_VARIABLE OS_DISTRIBUTOR - ERROR_QUIET) - if (RETCODE EQUAL 0) - string(REGEX REPLACE "\n$" "" OS_DISTRIBUTOR "${OS_DISTRIBUTOR}") - else () - set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") - endif () -elseif () - set(OS_DISTRIBUTOR "${CMAKE_SYSTEM_NAME}") -endif () - # Set startup script to auto if not define. if (NOT WITH_STARTUP_SCRIPT) set(WITH_STARTUP_SCRIPT "auto") From 9a95eab00baaa48e8b82cd86d62f1fe44e50af15 Mon Sep 17 00:00:00 2001 From: rem31 <73845199+rem31@users.noreply.github.com> Date: Mon, 6 Jun 2022 13:20:48 +0200 Subject: [PATCH 02/11] enh(debian/package): add a default config file for cbd on debian package REFS: MON-13830 --- ci/debian/centreon-broker-cbmod.install | 1 + ci/debian/centreon-broker.install | 3 +++ ci/debian/rules | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ci/debian/centreon-broker-cbmod.install b/ci/debian/centreon-broker-cbmod.install index 5d09bde4868..d4e7b8b82d5 100644 --- a/ci/debian/centreon-broker-cbmod.install +++ b/ci/debian/centreon-broker-cbmod.install @@ -1 +1,2 @@ debian/tmp-centreon-collect/usr/lib64/nagios/cbmod.so usr/lib64/nagios +debian/tmp-centreon-collect/etc/centreon-broker/central-module.json etc/centreon-broker \ No newline at end of file diff --git a/ci/debian/centreon-broker.install b/ci/debian/centreon-broker.install index 45a19687286..f3e54f07fd4 100644 --- a/ci/debian/centreon-broker.install +++ b/ci/debian/centreon-broker.install @@ -1,3 +1,6 @@ debian/extra/centreon-broker/cbd.service lib/systemd/system debian/tmp-centreon-collect/usr/sbin/cbd usr/sbin debian/tmp-centreon-collect/usr/sbin/cbwd usr/sbin +debian/tmp-centreon-collect/etc/centreon-broker/central-broker.json etc/centreon-broker +debian/tmp-centreon-collect/etc/centreon-broker/central-rrd.json etc/centreon-broker +debian/tmp-centreon-collect/etc/centreon-broker/watchdog.json etc/centreon-broker \ No newline at end of file diff --git a/ci/debian/rules b/ci/debian/rules index 34e16e2e324..c38b55893bf 100755 --- a/ci/debian/rules +++ b/ci/debian/rules @@ -18,6 +18,8 @@ override_dh_auto_configure: -DWITH_MODULE_SIMU=On \ -DWITH_BENCH=On \ -DWITH_CREATE_FILES=OFF \ + -DWITH_CONFIG_FILES=y \ + -DWITH_DAEMONS=y \ .. override_dh_auto_build: From e9570973f7346839e008bdcc437e303da1bd0ec2 Mon Sep 17 00:00:00 2001 From: rem31 <73845199+rem31@users.noreply.github.com> Date: Mon, 6 Jun 2022 10:17:43 +0200 Subject: [PATCH 03/11] enh(build/debian):clib.so on lib REFS: MON-13782 --- ci/debian/centreon-clib.install | 2 +- ci/debian/centreon-clib.postinst | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100755 ci/debian/centreon-clib.postinst diff --git a/ci/debian/centreon-clib.install b/ci/debian/centreon-clib.install index f78a375785d..d53d1c7f6d4 100644 --- a/ci/debian/centreon-clib.install +++ b/ci/debian/centreon-clib.install @@ -1 +1 @@ -debian/tmp-centreon-collect/usr/lib/x86_64-linux-gnu/libcentreon_clib.so usr/lib64 +debian/tmp-centreon-collect/usr/lib/x86_64-linux-gnu/libcentreon_clib.so usr/lib diff --git a/ci/debian/centreon-clib.postinst b/ci/debian/centreon-clib.postinst deleted file mode 100755 index 5fb194b8487..00000000000 --- a/ci/debian/centreon-clib.postinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ "$1" = "configure" ] ; then - /sbin/ldconfig -fi - -exit 0 \ No newline at end of file From 296cd787c8f5164f1edbce9a9e60bdff26977185 Mon Sep 17 00:00:00 2001 From: Luiz Costa Date: Tue, 7 Jun 2022 13:44:56 +0100 Subject: [PATCH 04/11] Add missing broker lib (#262) --- ci/debian/centreon-broker-storage.install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/debian/centreon-broker-storage.install b/ci/debian/centreon-broker-storage.install index 85760d6b5ca..0df5f4ae408 100644 --- a/ci/debian/centreon-broker-storage.install +++ b/ci/debian/centreon-broker-storage.install @@ -1,2 +1,3 @@ -debian/tmp-centreon-collect/usr/share/centreon/lib/centreon-broker/20-storage.so usr/share/centreon/lib/centreon-broker -debian/tmp-centreon-collect/usr/share/centreon/lib/centreon-broker/70-rrd.so usr/share/centreon/lib/centreon-broker +debian/tmp-centreon-collect/usr/share/centreon/lib/centreon-broker/20-storage.so usr/share/centreon/lib/centreon-broker +debian/tmp-centreon-collect/usr/share/centreon/lib/centreon-broker/20-unified_sql.so usr/share/centreon/lib/centreon-broker +debian/tmp-centreon-collect/usr/share/centreon/lib/centreon-broker/70-rrd.so usr/share/centreon/lib/centreon-broker From 688b23c8d6e405211c2a3da2c4359e9692fca195 Mon Sep 17 00:00:00 2001 From: rem31 <73845199+rem31@users.noreply.github.com> Date: Tue, 14 Jun 2022 10:19:24 +0200 Subject: [PATCH 05/11] fix(jenkins): update jenkinsfile --- Jenkinsfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8e1bdfc31e7..26c6f58d455 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -182,6 +182,16 @@ if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) { loadCommonScripts() sh 'rm -rf output && mkdir output && mv ../*.rpm output' sh './ci/scripts/collect-rpm-delivery.sh' + withCredentials([usernamePassword(credentialsId: 'nexus-credentials', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) { + checkout scm + unstash "Debian11" + sh 'mv bullseye/*.deb .' + sh '''for i in $(echo *.deb) + do + curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.04-$REPO/ + done + ''' + } } } } From 5fa5f1045935f388e271c63bba3f2d2bfc465feb Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Mon, 4 Jul 2022 14:41:07 +0200 Subject: [PATCH 06/11] fix jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26c6f58d455..d1bebe1be29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -185,7 +185,6 @@ if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) { withCredentials([usernamePassword(credentialsId: 'nexus-credentials', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) { checkout scm unstash "Debian11" - sh 'mv bullseye/*.deb .' sh '''for i in $(echo *.deb) do curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.04-$REPO/ From 375613f90117b4c2875fb71c8fae1d5d59375928 Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Mon, 4 Jul 2022 15:04:47 +0200 Subject: [PATCH 07/11] fix jenkinsfile --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index d1bebe1be29..c86a9925721 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,12 @@ if (env.CHANGE_BRANCH) { */ if (env.BRANCH_NAME.startsWith('release-')) { env.BUILD = 'RELEASE' + env.REPO = "testing" } else if ((env.BRANCH_NAME == env.REF_BRANCH) || (env.BRANCH_NAME == maintenanceBranch)) { env.BUILD = 'REFERENCE' } else if ((env.BRANCH_NAME == 'develop') || (env.BRANCH_NAME == qaBranch)) { env.BUILD = 'QA' + env.REPO = "unstable" } else { env.BUILD = 'CI' } From 410f5c9bf62f7aa8c49330ee39c7cc9ec4e69eef Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Mon, 4 Jul 2022 15:53:28 +0200 Subject: [PATCH 08/11] fix jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c86a9925721..8a9afcfbf42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -187,6 +187,7 @@ if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) { withCredentials([usernamePassword(credentialsId: 'nexus-credentials', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) { checkout scm unstash "Debian11" + sh 'ls -lart' sh '''for i in $(echo *.deb) do curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.04-$REPO/ From 22199bbb8beed565a267a230dd34f183959b665d Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Mon, 4 Jul 2022 16:17:14 +0200 Subject: [PATCH 09/11] fix jenkinsfile --- Jenkinsfile | 79 ++++++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 52 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a9afcfbf42..43f1af362c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,8 +8,8 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils env.REF_BRANCH = 'master' env.PROJECT='centreon-collect' def serie = '22.04' -def maintenanceBranch = "${serie}.x" -def qaBranch = "dev-${serie}.x" +def maintenanceBranch = "master" +def qaBranch = "develop" def buildBranch = env.BRANCH_NAME if (env.CHANGE_BRANCH) { buildBranch = env.CHANGE_BRANCH @@ -20,22 +20,17 @@ if (env.CHANGE_BRANCH) { */ if (env.BRANCH_NAME.startsWith('release-')) { env.BUILD = 'RELEASE' - env.REPO = "testing" + env.REPO = 'testing' } else if ((env.BRANCH_NAME == env.REF_BRANCH) || (env.BRANCH_NAME == maintenanceBranch)) { env.BUILD = 'REFERENCE' + env.REPO = 'testing' } else if ((env.BRANCH_NAME == 'develop') || (env.BRANCH_NAME == qaBranch)) { env.BUILD = 'QA' - env.REPO = "unstable" + env.REPO = 'unstable' } else { env.BUILD = 'CI' } -// Skip sonarQ analysis on branch without PR - Unable to merge -def securityAnalysisRequired = 'yes' -if (!env.CHANGE_ID && env.BUILD == 'CI') { - securityAnalysisRequired = 'no' -} - /* ** Pipeline code. */ @@ -63,37 +58,21 @@ stage('Build / Unit tests // Packaging / Signing') { }, 'centos7 SQ analysis': { node("C++") { - if (securityAnalysisRequired == 'no') { - Utils.markStageSkippedForConditional('centos7 SQ analysis') - } else { - dir('centreon-collect-centos7') { - checkout scm - loadCommonScripts() - sh 'ci/scripts/collect-sonar-scanner-common.sh "install"' - withSonarQubeEnv('SonarQubeDev') { - if (env.CHANGE_ID) { - sh 'ci/scripts/collect-sonar-scanner-common.sh "get"' - sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "PR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$CHANGE_TARGET" "$CHANGE_BRANCH" "$CHANGE_ID"' - } else { - sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "NotPR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$BRANCH_NAME"' - } - if (env.BUILD == "REFERENCE" || env.BUILD == "QA") { - // Saving cache's tarball if generated - sh 'ci/scripts/collect-sonar-scanner-common.sh "set"' - } + dir('centreon-collect-centos7') { + checkout scm + loadCommonScripts() + withSonarQubeEnv('SonarQubeDev') { + sh 'ci/scripts/collect-sonar-scanner-common.sh "get" "develop"' + if (env.CHANGE_ID) { + sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "PR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$CHANGE_TARGET" "$CHANGE_BRANCH" "$CHANGE_ID"' + } else { + sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "NotPR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$BRANCH_NAME"' } + sh 'ci/scripts/collect-sonar-scanner-common.sh "set"' } } } - },/* - 'centos8 Build and UT': { - node("C++") { - dir('centreon-collect-centos8') { - checkout scm - sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos8-dependencies:22.04-testdocker' - } - } - },*/ + }, 'centos7 rpm packaging and signing': { node("C++") { dir('centreon-collect-centos7') { @@ -149,28 +128,24 @@ stage('Build / Unit tests // Packaging / Signing') { dir('centreon-collect') { checkout scm } - sh 'docker run -i --entrypoint /src/centreon-collect/ci/scripts/collect-deb-package.sh -v "$PWD:/src" -e DISTRIB="Debian11" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-debian11-dependencies:22.04' - stash name: 'Debian11', includes: 'Debian11/*.deb' - archiveArtifacts artifacts: "Debian11/*" + sh 'docker run -i --entrypoint /src/centreon-collect/ci/scripts/collect-deb-package.sh -v "$PWD:/src" -e DISTRIB="bullseye" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-debian11-dependencies:22.04' + stash name: 'Debian11', includes: 'bullseye/*.deb' + archiveArtifacts artifacts: "bullseye/*" } } } stage('Quality Gate') { node("C++") { - if (securityAnalysisRequired == 'no') { - Utils.markStageSkippedForConditional('Quality Gate') - } else { - timeout(time: 10, unit: 'MINUTES') { - def qualityGate = waitForQualityGate() - if (qualityGate.status != 'OK') { - error "Pipeline aborted due to quality gate failure: ${qualityGate.status}" - } - } - if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { - error("Quality gate failure: ${qualityGate.status}."); + timeout(time: 10, unit: 'MINUTES') { + def qualityGate = waitForQualityGate() + if (qualityGate.status != 'OK') { + error "Pipeline aborted due to quality gate failure: ${qualityGate.status}" } } + if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { + error("Quality gate failure: ${qualityGate.status}."); + } } } @@ -187,7 +162,7 @@ if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) { withCredentials([usernamePassword(credentialsId: 'nexus-credentials', passwordVariable: 'NEXUS_PASSWORD', usernameVariable: 'NEXUS_USERNAME')]) { checkout scm unstash "Debian11" - sh 'ls -lart' + sh 'mv bullseye/*.deb .' sh '''for i in $(echo *.deb) do curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.04-$REPO/ From 115baca2eb504540a1520f70367568cbdf1e2c74 Mon Sep 17 00:00:00 2001 From: Zakaria GUENNOUNE Date: Mon, 4 Jul 2022 16:20:22 +0200 Subject: [PATCH 10/11] fix jenkinsfile --- Jenkinsfile | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43f1af362c9..dabc96d5e78 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,23 +56,6 @@ stage('Build / Unit tests // Packaging / Signing') { } } }, - 'centos7 SQ analysis': { - node("C++") { - dir('centreon-collect-centos7') { - checkout scm - loadCommonScripts() - withSonarQubeEnv('SonarQubeDev') { - sh 'ci/scripts/collect-sonar-scanner-common.sh "get" "develop"' - if (env.CHANGE_ID) { - sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "PR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$CHANGE_TARGET" "$CHANGE_BRANCH" "$CHANGE_ID"' - } else { - sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04 "NotPR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$BRANCH_NAME"' - } - sh 'ci/scripts/collect-sonar-scanner-common.sh "set"' - } - } - } - }, 'centos7 rpm packaging and signing': { node("C++") { dir('centreon-collect-centos7') { @@ -135,20 +118,6 @@ stage('Build / Unit tests // Packaging / Signing') { } } -stage('Quality Gate') { - node("C++") { - timeout(time: 10, unit: 'MINUTES') { - def qualityGate = waitForQualityGate() - if (qualityGate.status != 'OK') { - error "Pipeline aborted due to quality gate failure: ${qualityGate.status}" - } - } - if ((currentBuild.result ?: 'SUCCESS') != 'SUCCESS') { - error("Quality gate failure: ${qualityGate.status}."); - } - } -} - if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) { stage('Delivery') { node("C++") { From 5472b0550da422f7babb0d064869b27cca65e90c Mon Sep 17 00:00:00 2001 From: Luiz Costa Date: Mon, 18 Jul 2022 11:33:06 +0100 Subject: [PATCH 11/11] bypass debian build dwz process --- ci/debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/debian/rules b/ci/debian/rules index c38b55893bf..dcd9feb2d7a 100755 --- a/ci/debian/rules +++ b/ci/debian/rules @@ -29,3 +29,5 @@ override_dh_auto_build: override_dh_auto_install: cd build && \ make -j9 install DESTDIR=../debian/tmp-centreon-collect + +override_dh_dwz: