fix robot db issue, minor are equal for collect and agent

centreon · Feb 20, 2025 · 6df11b4 · 6df11b4
1 parent 9f3a92e
commit 6df11b4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.github/docker/Dockerfile.centreon-collect-mariadb-alma9-test b/.github/docker/Dockerfile.centreon-collect-mariadb-alma9-test
@@ -35,7 +35,7 @@ dnf install --best -y \
 
 echo "install robot and dependencies"
 
-pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install -U robotframework robotframework-databaselibrary==2.0.4 robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
 
 cd /tmp/collect

diff --git a/.github/docker/Dockerfile.centreon-collect-mariadb-bookworm-test b/.github/docker/Dockerfile.centreon-collect-mariadb-bookworm-test
@@ -34,7 +34,7 @@ apt-get clean
 
 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
-pip3 install --break-system-packages -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install --break-system-packages -U robotframework robotframework-databaselibrary==2.0.4 robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install --break-system-packages grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
 
 cd /tmp/collect

diff --git a/.github/docker/Dockerfile.centreon-collect-mariadb-bullseye-test b/.github/docker/Dockerfile.centreon-collect-mariadb-bullseye-test
@@ -34,7 +34,7 @@ apt-get clean
 
 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
-pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install -U robotframework robotframework-databaselibrary==2.0.4 robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
 
 cd /tmp/collect

diff --git a/.github/docker/Dockerfile.centreon-collect-mariadb-jammy-test b/.github/docker/Dockerfile.centreon-collect-mariadb-jammy-test
@@ -38,7 +38,7 @@ apt-get clean
 
 localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 
-pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install -U robotframework robotframework-databaselibrary==2.0.4 robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests
 
 cd /tmp/collect

diff --git a/.github/docker/Dockerfile.centreon-collect-mysql-alma9-test b/.github/docker/Dockerfile.centreon-collect-mysql-alma9-test
@@ -41,7 +41,7 @@ dnf clean all
 
 echo "install robot and dependencies"
 
-pip3 install -U robotframework robotframework-databaselibrary robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
+pip3 install -U robotframework robotframework-databaselibrary==2.0.4 robotframework-httpctrl robotframework-examples pymysql python-dateutil psutil
 pip3 install grpcio grpcio_tools py-cpuinfo cython unqlite gitpython boto3 robotframework-requests cryptography
 
 cd /tmp/collect

diff --git a/.github/workflows/get-environment.yml b/.github/workflows/get-environment.yml
@@ -319,7 +319,7 @@ jobs:
             MAJOR=$(awk '$1 ~ "COLLECT_MAJOR" {maj=substr($2, 1, length($2)-1)} $1 ~ "COLLECT_MINOR" {min=substr($2, 1, length($2)-1) ; print maj "." min}' CMakeLists.txt)
             MINOR=$(awk '$1 ~ "COLLECT_PATCH" {print substr($2, 1, length($2) - 1)}' CMakeLists.txt)
             VERSION="$MAJOR.$MINOR"
-            CMA_MAJOR=$(awk '$1 ~ "COLLECT_MAJOR" {maj=substr($2, 1, length($2)-1)} $1 ~ "AGENT_MINOR" {min=substr($2, 1, length($2)-1) ; print maj "." min}' CMakeLists.txt)
+            CMA_MAJOR=$(awk '$1 ~ "COLLECT_MAJOR" {maj=substr($2, 1, length($2)-1)} $1 ~ "COLLECT_MINOR" {min=substr($2, 1, length($2)-1) ; print maj "." min}' CMakeLists.txt)
             CMA_MINOR=$(awk '$1 ~ "AGENT_PATCH" {print substr($2, 1, length($2) - 1)}' CMakeLists.txt)
             CMA_VERSION="$CMA_MAJOR.$CMA_MINOR"
           else

diff --git a/.github/workflows/package-collect.yml b/.github/workflows/package-collect.yml
@@ -89,7 +89,7 @@ jobs:
       SCCACHE_REGION: "eu-west-1"
       AWS_ACCESS_KEY_ID: ${{ secrets.collect_s3_access_key }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.collect_s3_secret_key }}
-      ONLY_ROBOT_CMA: ${{ github.event.inputs.only_robot_cma  != 'true' && 'OFF' || 'ON' }}
+      ONLY_ROBOT_CMA: ${{ inputs.only_robot_cma  != 'true' && 'OFF' || 'ON' }}
 
     container:
       image: ${{ vars.DOCKER_INTERNAL_REGISTRY_URL }}/${{ inputs.image }}:${{ inputs.img_version }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,7 +121,7 @@ set(COLLECT_MAJOR 25)
 set(COLLECT_MINOR 03)
 set(COLLECT_PATCH 0)
 set(AGENT_MAJOR ${COLLECT_MAJOR})
-set(AGENT_MINOR 03)
+set(AGENT_MINOR ${COLLECT_MINOR})
 set(AGENT_PATCH 0)
 set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")