From 9b6cb25b9472b648ce31ea26411551845596f86c Mon Sep 17 00:00:00 2001 From: Evan-Adam <152897682+Evan-Adam@users.noreply.github.com> Date: Mon, 7 Jul 2025 17:19:33 +0200 Subject: [PATCH 1/2] fix(snmp-cache): remove cache before robot tests (#5661) --- tests/network/cisco/standard/snmp/arp.robot | 2 +- tests/network/cisco/standard/snmp/configuration.robot | 2 +- tests/network/cisco/standard/snmp/cpu.robot | 2 +- tests/network/cisco/standard/snmp/interfaces.robot | 3 +-- tests/network/cisco/standard/snmp/list-interfaces.robot | 2 +- tests/network/cisco/standard/snmp/memory-flash.robot | 2 +- tests/network/cisco/standard/snmp/memory.robot | 2 +- tests/network/cisco/standard/snmp/stack.robot | 2 +- tests/network/cisco/standard/snmp/uptime.robot | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/network/cisco/standard/snmp/arp.robot b/tests/network/cisco/standard/snmp/arp.robot index f17aebfa2..5e0c02dd8 100644 --- a/tests/network/cisco/standard/snmp/arp.robot +++ b/tests/network/cisco/standard/snmp/arp.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/configuration.robot b/tests/network/cisco/standard/snmp/configuration.robot index 04d24ac19..aa8682d3a 100644 --- a/tests/network/cisco/standard/snmp/configuration.robot +++ b/tests/network/cisco/standard/snmp/configuration.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/cpu.robot b/tests/network/cisco/standard/snmp/cpu.robot index 990a80233..6685115c4 100644 --- a/tests/network/cisco/standard/snmp/cpu.robot +++ b/tests/network/cisco/standard/snmp/cpu.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/interfaces.robot b/tests/network/cisco/standard/snmp/interfaces.robot index 8139b9edb..7cefd8591 100644 --- a/tests/network/cisco/standard/snmp/interfaces.robot +++ b/tests/network/cisco/standard/snmp/interfaces.robot @@ -1,10 +1,9 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s - *** Variables *** ${CMD} ${CENTREON_PLUGINS} --plugin=network::cisco::standard::snmp::plugin diff --git a/tests/network/cisco/standard/snmp/list-interfaces.robot b/tests/network/cisco/standard/snmp/list-interfaces.robot index 268e5ffb7..7b7b9dcae 100644 --- a/tests/network/cisco/standard/snmp/list-interfaces.robot +++ b/tests/network/cisco/standard/snmp/list-interfaces.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/memory-flash.robot b/tests/network/cisco/standard/snmp/memory-flash.robot index 17fa960ae..f8f362e2d 100644 --- a/tests/network/cisco/standard/snmp/memory-flash.robot +++ b/tests/network/cisco/standard/snmp/memory-flash.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Network citrix netscaler health - +Suite Setup Ctn Generic Suite Setup Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/memory.robot b/tests/network/cisco/standard/snmp/memory.robot index b3dfd91e7..7c53a9520 100644 --- a/tests/network/cisco/standard/snmp/memory.robot +++ b/tests/network/cisco/standard/snmp/memory.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/stack.robot b/tests/network/cisco/standard/snmp/stack.robot index 572f91b14..8019b9fb5 100644 --- a/tests/network/cisco/standard/snmp/stack.robot +++ b/tests/network/cisco/standard/snmp/stack.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s diff --git a/tests/network/cisco/standard/snmp/uptime.robot b/tests/network/cisco/standard/snmp/uptime.robot index 882ee541f..eeb3da5cb 100644 --- a/tests/network/cisco/standard/snmp/uptime.robot +++ b/tests/network/cisco/standard/snmp/uptime.robot @@ -1,7 +1,7 @@ *** Settings *** Resource ${CURDIR}${/}..${/}..${/}..${/}..${/}resources/import.resource - +Suite Setup Ctn Generic Suite Setup Test Timeout 120s From 5581042e2a541f50b6cecfdbd1e466b103d0cdca Mon Sep 17 00:00:00 2001 From: tuntoja <58987095+tuntoja@users.noreply.github.com> Date: Mon, 7 Jul 2025 17:37:24 +0200 Subject: [PATCH 2/2] fix(ci): run plugins-suoders delivery only if packaging is triggered (#5662) --- .github/workflows/centreon-plugins-sudoers.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/centreon-plugins-sudoers.yml b/.github/workflows/centreon-plugins-sudoers.yml index a4c586239..6e6925216 100644 --- a/.github/workflows/centreon-plugins-sudoers.yml +++ b/.github/workflows/centreon-plugins-sudoers.yml @@ -84,10 +84,7 @@ jobs: deliver-packages: needs: [get-environment, package] if: | - (contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) || ( needs.get-environment.outputs.stability == 'stable' && github.event_name != 'workflow_dispatch')) && - ! cancelled() && - ! contains(needs.*.result, 'failure') && - ! contains(needs.*.result, 'cancelled') + (contains(fromJson('["testing", "unstable"]'), needs.get-environment.outputs.stability) || ( needs.get-environment.outputs.stability == 'stable' && github.event_name != 'workflow_dispatch')) runs-on: ubuntu-24.04 strategy: fail-fast: false