Skip to content

Commit

Permalink
MON-151748 Sync Centreon release 23.04 (#1902)
Browse files Browse the repository at this point in the history
  • Loading branch information
pkippes authored Nov 27, 2024
2 parents 51ddc26 + facf804 commit 11d9cd3
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/delivery/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/robot-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MAJOR=23.04
MINOR=15
MINOR=16
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}\")

Expand Down
2 changes: 1 addition & 1 deletion tests/broker-engine/delete-poller.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions tests/resources/resources.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 11d9cd3

Please sign in to comment.