Skip to content

Commit

Permalink
cleanup(build): build files reorganized
Browse files Browse the repository at this point in the history
  • Loading branch information
bouda1 committed Jun 14, 2022
1 parent 54a714e commit 109b154
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 275 deletions.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ set(COLLECT_MINOR 10)
set(COLLECT_PATCH 0)
set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")
# add_definitions(-DCENTREON_BROKER_VERSION=\"${COLLECT_VERSION}\")


############ CONSTANTS ###########
Expand Down
36 changes: 19 additions & 17 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -148,24 +148,26 @@ stage('Quality Gate') {
}
}

stage('Delivery') {
node("C++") {
unstash 'el8-rpms'
unstash 'el7-rpms'
dir('centreon-collect-delivery') {
checkout scm
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')]) {
if ((env.BUILD == 'RELEASE') || (env.BUILD == 'QA')) {
stage('Delivery') {
node("C++") {
unstash 'el8-rpms'
unstash 'el7-rpms'
dir('centreon-collect-delivery') {
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.10-$REPO/
done
'''
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.10-$REPO/
done
'''
}
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions broker/grpc/src/stream.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,8 @@ int32_t com::centreon::broker::grpc::stream::write(
event_ptr to_send(std::make_shared<grpc_event_type>());

std::shared_ptr<io::raw> raw_src = std::static_pointer_cast<io::raw>(d);
if (raw_src) {
to_send->mutable_buffer()->assign(raw_src->_buffer.begin(),
raw_src->_buffer.end());
}

to_send->mutable_buffer()->assign(raw_src->_buffer.begin(),
raw_src->_buffer.end());
return _channel->write(to_send);
}

Expand Down
54 changes: 0 additions & 54 deletions clib/.github/workflows/dependabot_jira.yml

This file was deleted.

54 changes: 0 additions & 54 deletions connectors/.github/workflows/dependabot_jira.yml

This file was deleted.

90 changes: 0 additions & 90 deletions engine/.github/ISSUE_TEMPLATE.md

This file was deleted.

54 changes: 0 additions & 54 deletions engine/.github/workflows/dependabot_jira.yml

This file was deleted.

0 comments on commit 109b154

Please sign in to comment.