diff --git a/Jenkinsfile b/Jenkinsfile index 2900d2f..f1fe3a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ /* ** Variables. */ -def serie = '22.04' +def serie = '22.10' def maintenanceBranch = "${serie}.x" def qaBranch = "dev-${serie}.x" @@ -87,7 +87,7 @@ stage('RPM/DEB packaging') { dir('centreon-ha') { checkout scm } - sh 'docker run -i --entrypoint "/src/centreon-ha/ci/scripts/centreon-ha-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-ha/ci/scripts/centreon-ha-package.sh" -w "/src" -v "$PWD:/src" -e "DISTRIB=bullseye" -e "VERSION=$VERSION" -e "RELEASE=$RELEASE" registry.centreon.com/centreon-debian11-dependencies:22.10' stash name: 'Debian11', includes: '*.deb' archiveArtifacts artifacts: "*" } @@ -109,7 +109,7 @@ if ((env.BUILD == 'RELEASE') || (env.BUILD == 'CI') || (env.BUILD == 'QA') ) { unstash "Debian11" 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/ + curl -u $NEXUS_USERNAME:$NEXUS_PASSWORD -H "Content-Type: multipart/form-data" --data-binary "@./$i" https://apt.centreon.com/repository/22.10-$REPO/ done ''' } diff --git a/ci/debian/centreon-ha-common.dirs b/ci/debian/centreon-ha-common.dirs new file mode 100644 index 0000000..3a576da --- /dev/null +++ b/ci/debian/centreon-ha-common.dirs @@ -0,0 +1 @@ +/var/log/centreon-ha diff --git a/ci/debian/centreon-ha.install b/ci/debian/centreon-ha-common.install similarity index 100% rename from ci/debian/centreon-ha.install rename to ci/debian/centreon-ha-common.install diff --git a/ci/debian/centreon-ha.postinst b/ci/debian/centreon-ha-common.postinst similarity index 74% rename from ci/debian/centreon-ha.postinst rename to ci/debian/centreon-ha-common.postinst index b04ccf6..5542c59 100755 --- a/ci/debian/centreon-ha.postinst +++ b/ci/debian/centreon-ha-common.postinst @@ -5,6 +5,7 @@ if [ "$1" = "configure" ] ; then if [ "$(getent passwd centreon)" ]; then chown -vR centreon:centreon /var/log/centreon-ha chmod -vR 0755 /var/log/centreon-ha + chmod gu+x /usr/lib/ocf/resource.d/heartbeat/mariadb-centreon fi fi diff --git a/ci/debian/centreon-ha.dirs b/ci/debian/centreon-ha.dirs deleted file mode 100644 index 82d8106..0000000 --- a/ci/debian/centreon-ha.dirs +++ /dev/null @@ -1 +0,0 @@ -/var/log/centreon-ha \ No newline at end of file