summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromnom62 <75066712+omnom62@users.noreply.github.com>2026-04-03 23:37:54 +1000
committerGitHub <noreply@github.com>2026-04-03 14:37:54 +0100
commitfdc70e9ce400c5551b9dd83a7c979ba0db8209ef (patch)
tree9684f3930603c99d3d68ecd57c78eaf82778d538
parentab0aa4bd1a16b044f061053aa78b0fa865312545 (diff)
downloadvyos.vyos-fdc70e9ce400c5551b9dd83a7c979ba0db8209ef.tar.gz
vyos.vyos-fdc70e9ce400c5551b9dd83a7c979ba0db8209ef.zip
CI tests fixes (ADE related) (#450)
* Init for the fixes related to ADE * testing new tox.ini * tox ade fixes * test tox * test tox * testing tox * test tox * test tox * testing tox * testing fix * testing a fix * testing tox * testing fix * bindep.txt test * test with tox
-rw-r--r--.gitignore2
-rw-r--r--bindep.txt2
-rw-r--r--changelogs/fragments/ades-fix.yml3
-rw-r--r--tests/sanity/ignore-2.15.txt35
-rw-r--r--tests/sanity/ignore-2.16.txt35
-rw-r--r--tests/sanity/ignore-2.17.txt35
-rw-r--r--tests/sanity/ignore-2.18.txt35
-rw-r--r--tests/sanity/ignore-2.19.txt35
-rw-r--r--tests/sanity/ignore-2.20.txt35
-rw-r--r--tests/sanity/ignore-2.21.txt35
-rw-r--r--tox-ansible.ini4
11 files changed, 256 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index eaef097a..cbe347c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,5 @@ venv.bak/
changelogs/.plugin-cache.yaml
# inventory for testing
inventory.network
+
+*.bak
diff --git a/bindep.txt b/bindep.txt
index 574a4047..9233bcfe 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -3,5 +3,7 @@
gcc-c++ [doc test platform:rpm]
libssh-devel [test platform:rpm]
+libssh-dev [platform:dpkg]
+libssh-devel [platform:rpm]
libffi-devel [test platform:rpm]
openssl-devel [test platform:rpm]
diff --git a/changelogs/fragments/ades-fix.yml b/changelogs/fragments/ades-fix.yml
new file mode 100644
index 00000000..bf6d7159
--- /dev/null
+++ b/changelogs/fragments/ades-fix.yml
@@ -0,0 +1,3 @@
+---
+trivial:
+ - tox-ansible.ini - Attempt to fallback to the previous test environment setup (without failing ADE)
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.15.txt
+++ b/tests/sanity/ignore-2.15.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.16.txt
+++ b/tests/sanity/ignore-2.16.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.17.txt
+++ b/tests/sanity/ignore-2.17.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.18.txt b/tests/sanity/ignore-2.18.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.18.txt
+++ b/tests/sanity/ignore-2.18.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.19.txt b/tests/sanity/ignore-2.19.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.19.txt
+++ b/tests/sanity/ignore-2.19.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.20.txt b/tests/sanity/ignore-2.20.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.20.txt
+++ b/tests/sanity/ignore-2.20.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt
index c835eef8..a6ddbd51 100644
--- a/tests/sanity/ignore-2.21.txt
+++ b/tests/sanity/ignore-2.21.txt
@@ -1 +1,36 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
+plugins/action/banner.py action-plugin-docs
+plugins/action/bgp_address_family.py action-plugin-docs
+plugins/action/bgp_global.py action-plugin-docs
+plugins/action/command.py action-plugin-docs
+plugins/action/config.py action-plugin-docs
+plugins/action/facts.py action-plugin-docs
+plugins/action/firewall_global.py action-plugin-docs
+plugins/action/firewall_interfaces.py action-plugin-docs
+plugins/action/firewall_rules.py action-plugin-docs
+plugins/action/hostname.py action-plugin-docs
+plugins/action/interface.py action-plugin-docs
+plugins/action/interfaces.py action-plugin-docs
+plugins/action/l3_interface.py action-plugin-docs
+plugins/action/l3_interfaces.py action-plugin-docs
+plugins/action/lag_interfaces.py action-plugin-docs
+plugins/action/linkagg.py action-plugin-docs
+plugins/action/lldp.py action-plugin-docs
+plugins/action/lldp_global.py action-plugin-docs
+plugins/action/lldp_interface.py action-plugin-docs
+plugins/action/lldp_interfaces.py action-plugin-docs
+plugins/action/logging_global.py action-plugin-docs
+plugins/action/ntp_global.py action-plugin-docs
+plugins/action/ospf_interfaces.py action-plugin-docs
+plugins/action/ospfv2.py action-plugin-docs
+plugins/action/ospfv3.py action-plugin-docs
+plugins/action/ping.py action-plugin-docs
+plugins/action/prefix_lists.py action-plugin-docs
+plugins/action/route_maps.py action-plugin-docs
+plugins/action/snmp_server.py action-plugin-docs
+plugins/action/static_route.py action-plugin-docs
+plugins/action/static_routes.py action-plugin-docs
+plugins/action/system.py action-plugin-docs
+plugins/action/user.py action-plugin-docs
+plugins/action/vlan.py action-plugin-docs
+plugins/action/vrf.py action-plugin-docs
diff --git a/tox-ansible.ini b/tox-ansible.ini
new file mode 100644
index 00000000..5d3c8ddd
--- /dev/null
+++ b/tox-ansible.ini
@@ -0,0 +1,4 @@
+[ansible]
+skip =
+ py3.13
+ py3.14