Merge branch '23.04.x' into sync-release-151748

.github/actions/delivery/action.yml

@@ -146,7 +146,7 @@ runs:
         echo "[DEBUG] - stability: ${{ inputs.stability }}"
 
         # Make sure all required inputs are NOT empty
-        if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" || -z "${{ inputs.release_type }}" ]]; then
+        if [[ -z "${{ inputs.module_name }}" || -z "${{ inputs.distrib }}" || -z ${{ inputs.stability }} || -z ${{ inputs.major_version }} || -z "${{ inputs.is_cloud }}" ]]; then
           echo "Some mandatory inputs are empty, please check the logs."
           exit 1
         fi

.github/workflows/robot-test.yml

@@ -114,11 +114,20 @@ jobs:
             cp tests/output.xml reports/$FILE_PREFIX-output.xml
           fi
 
+      - name: Replace / with - in the feature path
+        id: feature-path
+        if: always()
+        run: |
+          feature_name="${{ matrix.feature }}"
+          feature_name_with_dash="${feature_name//\//-}"
+          echo "Modified Feature Name: $feature_name_with_dash"
+          echo "feature_name_with_dash=$feature_name_with_dash" >> $GITHUB_OUTPUT
+
       - name: Upload Test Results
         if: ${{ failure() }}
         uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
-          name: reports-${{inputs.test_group_name}}
+          name: reports-${{inputs.test_group_name}}-${{ steps.feature-path.outputs.feature_name_with_dash }}
           path: reports
           retention-days: 1
 

.version

@@ -1,2 +1,2 @@
 MAJOR=23.04
-MINOR=15
+MINOR=16

CMakeLists.txt

@@ -116,7 +116,7 @@ endif()
 # Version.
 set(COLLECT_MAJOR 23)
 set(COLLECT_MINOR 04)
-set(COLLECT_PATCH 15)
+set(COLLECT_PATCH 16)
 set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")
 

tests/broker-engine/delete-poller.robot

@@ -669,4 +669,4 @@ EBDP8
 *** Keywords ***
 Ctn Clear Instances
     Connect To Database    pymysql    ${DBName}    ${DBUser}    ${DBPass}    ${DBHost}    ${DBPort}
-    ${output}    Query    DELETE FROM instances
+    Execute SQL String    DELETE FROM instances

tests/resources/resources.robot

@@ -212,7 +212,7 @@ Ctn Stop Engine Broker And Save Logs
 Ctn Get Engine Pid
 	[Arguments]  ${process_alias}
 	${pid}=  Get Process Id  ${process_alias} 
-	[Return]  ${pid}
+	RETURN  ${pid}
 
 Ctn Reload Engine
 	${count}=	Ctn Get Engines Count
@@ -234,7 +234,7 @@ Ctn Check Connections
 	${pid2}=	Get Process Id	b2
 	Log to console	Check Connection 5670 ${pid1} ${pid2}
 	${retval}=	Ctn Check Connection	5670	${pid1}	${pid2}
-	[Return]	${retval}
+	RETURN	${retval}
 
 Ctn Disable Eth Connection On Port
 	[Arguments]	${port}
@@ -283,7 +283,7 @@ Ctn Wait Or Dump And Kill Process
 		Run Process  gcore  -o  ${ENGINE_LOG}/config0/gcore_${process_name}  ${pid}
 		${result}=      Wait For Process	${process_name}	timeout=1s      on_timeout=kill
 	END
-	[Return]	${result}
+	RETURN	${result}
 
 Ctn Clear Metrics
 	Connect To Database	pymysql	${DBName}	${DBUser}	${DBPass}	${DBHost}	${DBPort}