core(version): prepare the 22.10 version (#259)

centreon · Jun 7, 2022 · 0ae99e3 · 0ae99e3
1 parent 7ea08c8
commit 0ae99e3
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 98 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,8 +46,8 @@ endif ()
 
 # Version.
 set(COLLECT_MAJOR 22)
-set(COLLECT_MINOR 04)
-set(COLLECT_PATCH 1)
+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}\")

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -7,9 +7,9 @@ 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 serie = '22.10'
+def maintenanceBranch = "master"
+def qaBranch = "develop"
 def buildBranch = env.BRANCH_NAME
 if (env.CHANGE_BRANCH) {
   buildBranch = env.CHANGE_BRANCH
@@ -49,7 +49,7 @@ stage('Build / Unit tests // Packaging / Signing') {
     node("C++") {
       dir('centreon-collect-centos7') {
         checkout scm
-        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04'
+        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.10'
       }
     }
   },
@@ -61,9 +61,9 @@ stage('Build / Unit tests // Packaging / Signing') {
         withSonarQubeEnv('SonarQubeDev') {
           sh 'ci/scripts/collect-sonar-scanner-common.sh "get" "master"'
           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"'
+            sh 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.10 "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 'docker run -i --entrypoint /src/ci/scripts/collect-sources-analysis.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.10 "NotPR" "$SONAR_AUTH_TOKEN" "$SONAR_HOST_URL" "$VERSION" "$BRANCH_NAME"'
           }
           sh 'ci/scripts/collect-sonar-scanner-common.sh "set"'
         }
@@ -74,7 +74,7 @@ stage('Build / Unit tests // Packaging / Signing') {
     node("C++") {
       dir('centreon-collect-centos7') {
         checkout scm
-        sh 'docker run -i --entrypoint /src/ci/scripts/collect-rpm-package.sh -v "$PWD:/src" -e DISTRIB="el7" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-centos7-dependencies:22.04'
+        sh 'docker run -i --entrypoint /src/ci/scripts/collect-rpm-package.sh -v "$PWD:/src" -e DISTRIB="el7" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-centos7-dependencies:22.10'
         sh 'rpmsign --addsign *.rpm'
         stash name: 'el7-rpms', includes: '*.rpm'
         archiveArtifacts artifacts: "*.rpm"
@@ -86,7 +86,7 @@ stage('Build / Unit tests // Packaging / Signing') {
     node("C++") {
       dir('centreon-collect-alma8') {
         checkout scm
-        sh 'docker run -i --entrypoint /src/ci/scripts/collect-rpm-package.sh -v "$PWD:/src" -e DISTRIB="el8" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-alma8-dependencies:22.04'
+        sh 'docker run -i --entrypoint /src/ci/scripts/collect-rpm-package.sh -v "$PWD:/src" -e DISTRIB="el8" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-alma8-dependencies:22.10'
         sh 'rpmsign --addsign *.rpm'
         stash name: 'el8-rpms', includes: '*.rpm'
         archiveArtifacts artifacts: "*.rpm"
@@ -98,7 +98,7 @@ stage('Build / Unit tests // Packaging / Signing') {
     node("C++") {
       dir('centreon-collect-debian10') {
         checkout scm
-        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-debian10-dependencies:22.04'
+        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-debian10-dependencies:22.10'
       }
     }
   },
@@ -107,7 +107,7 @@ 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="Debian10" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-debian10-dependencies:22.04'
+      sh 'docker run -i --entrypoint /src/centreon-collect/ci/scripts/collect-deb-package.sh -v "$PWD:/src" -e DISTRIB="Debian10" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-debian10-dependencies:22.10'
       stash name: 'Debian10', includes: 'Debian10/*.deb'
       archiveArtifacts artifacts: "Debian10/*"
     }
@@ -116,7 +116,7 @@ stage('Build / Unit tests // Packaging / Signing') {
     node("C++") {
       dir('centreon-collect-debian11') {
         checkout scm
-        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-debian11-dependencies:22.04'
+        sh 'docker run -i --entrypoint /src/ci/scripts/collect-unit-tests.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-debian11-dependencies:22.10'
       }
     }
   },
@@ -125,7 +125,7 @@ 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="bullseye" -e VERSION=$VERSION -e RELEASE=$RELEASE registry.centreon.com/centreon-collect-debian11-dependencies:22.04'
+      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.10'
       stash name: 'Debian11', includes: 'bullseye/*.deb'
       archiveArtifacts artifacts: "bullseye/*"
     }

diff --git a/broker/.github/PULL_REQUEST_TEMPLATE.md b/broker/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
@@ -9,8 +9,8 @@ stage('Dependencies containers creation') {
         checkout scm
         dir ('ci/docker') {
           sh 'cp ../../conanfile.txt .'
-          sh 'docker build --no-cache . -f Dockerfile.collect-centos7-dependencies -t registry.centreon.com/centreon-collect-centos7-dependencies:22.04'
-          sh 'docker push registry.centreon.com/centreon-collect-centos7-dependencies:22.04'
+          sh 'docker build --no-cache . -f Dockerfile.collect-centos7-dependencies -t registry.centreon.com/centreon-collect-centos7-dependencies:22.10'
+          sh 'docker push registry.centreon.com/centreon-collect-centos7-dependencies:22.10'
         }
       }
     }
@@ -21,8 +21,8 @@ stage('Dependencies containers creation') {
         checkout scm
         dir ('ci/docker') {
           sh 'cp ../../conanfile.txt .'
-          sh 'docker build --no-cache . -f Dockerfile.collect-debian10-dependencies -t registry.centreon.com/centreon-collect-debian10-dependencies:22.04'
-          sh 'docker push registry.centreon.com/centreon-collect-debian10-dependencies:22.04'
+          sh 'docker build --no-cache . -f Dockerfile.collect-debian10-dependencies -t registry.centreon.com/centreon-collect-debian10-dependencies:22.10'
+          sh 'docker push registry.centreon.com/centreon-collect-debian10-dependencies:22.10'
         }
       }
     }
@@ -33,8 +33,8 @@ stage('Dependencies containers creation') {
         checkout scm
         dir ('ci/docker') {
           sh 'cp ../../conanfile.txt .'
-          sh 'docker build --no-cache . -f Dockerfile.collect-debian11-dependencies -t registry.centreon.com/centreon-collect-debian11-dependencies:22.04'
-          sh 'docker push registry.centreon.com/centreon-collect-debian11-dependencies:22.04'
+          sh 'docker build --no-cache . -f Dockerfile.collect-debian11-dependencies -t registry.centreon.com/centreon-collect-debian11-dependencies:22.10'
+          sh 'docker push registry.centreon.com/centreon-collect-debian11-dependencies:22.10'
         }
       }
     }
@@ -45,8 +45,8 @@ stage('Dependencies containers creation') {
         checkout scm
         dir ('ci/docker') {
           sh 'cp ../../conanfile.txt .'
-          sh 'docker build --no-cache . -f Dockerfile.collect-alma8-dependencies -t registry.centreon.com/centreon-collect-alma8-dependencies:22.04'
-          sh 'docker push registry.centreon.com/centreon-collect-alma8-dependencies:22.04'
+          sh 'docker build --no-cache . -f Dockerfile.collect-alma8-dependencies -t registry.centreon.com/centreon-collect-alma8-dependencies:22.10'
+          sh 'docker push registry.centreon.com/centreon-collect-alma8-dependencies:22.10'
         }
       }
     }

diff --git a/ci/debian/substvars b/ci/debian/substvars
@@ -1 +1 @@
-centreon:version=22.04.0
+centreon:version=22.10.0
diff --git a/engine/.github/PULL_REQUEST_TEMPLATE.md b/engine/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/packaging/rpm/centreon-collect.spec b/packaging/rpm/centreon-collect.spec
@@ -10,8 +10,8 @@ License:        ASL 2.0
 Source: %{name}-%{version}.tar.gz
 Source1: centreonengine_integrate_centreon_engine2centreon.sh
 
-%define thismajor 22.04.0
-%define nextmajor 22.05.0
+%define thismajor 22.10.0
+%define nextmajor 22.11.0
 
 Group: Applications/Communications
 URL: https://github.com/centreon/centreon-collect.git

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
           agent any
           when { anyOf { branch 'master'; branch 'develop' } }
           steps {
-            sh 'docker run -i --entrypoint /src/ci/scripts/collect-test-robot.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.04'
+            sh 'docker run -i --entrypoint /src/ci/scripts/collect-test-robot.sh -v "$PWD:/src" registry.centreon.com/centreon-collect-centos7-dependencies:22.10'
             robot outputPath: 'tests', logFileName: 'log.html', outputFileName: 'output.xml', reportFileName: 'report.html', passThreshold: 100, unstableThreshold: 75.0
           }
           post { always { cleanWs() }}