From 676604394df3befc53d22b492ac3acfeee11ce40 Mon Sep 17 00:00:00 2001
From: Roman Dodin <dodin.roman@gmail.com>
Date: Sun, 23 Jun 2024 00:30:05 +0300
Subject: [PATCH] update sanity test setup

---
 run.sh                       | 18 ++++++++++--------
 tests/sanity/ignore-2.10.txt | 11 +++++------
 tests/sanity/ignore-2.14.txt | 11 +++++------
 tests/sanity/ignore-2.15.txt | 28 ++++++++++++++++++++++++++++
 tests/sanity/ignore-2.16.txt | 28 ++++++++++++++++++++++++++++
 tests/sanity/ignore-2.17.txt | 28 ++++++++++++++++++++++++++++
 6 files changed, 104 insertions(+), 20 deletions(-)
 create mode 100644 tests/sanity/ignore-2.15.txt
 create mode 100644 tests/sanity/ignore-2.16.txt
 create mode 100644 tests/sanity/ignore-2.17.txt

diff --git a/run.sh b/run.sh
index 90134e1..fe7b84d 100755
--- a/run.sh
+++ b/run.sh
@@ -86,14 +86,7 @@ function revert-to-checkpoint {
   docker exec ${NODE_NAME} sr_cli /tools system configuration checkpoint initial revert
 }
 
-# copy sanity ignore files from ignore-2.10.txt to all other supported ansible versions
-function copy-sanity-ignore {
-  _cdTests
-  cd sanity
-  for version in 2.14; do
-    cp ignore-2.10.txt ignore-${version}.txt
-  done
-}
+
 
 # -----------------------------------------------------------------------------
 # Test functions.
@@ -335,6 +328,15 @@ function ci-test {
   ANSIBLE_CONFIG=ci-ansible.cfg _run-tests "$@"
 }
 
+# copy sanity ignore files from ignore-2.10.txt to all other supported ansible versions
+function copy-sanity-ignore {
+  _cdTests
+  cd sanity
+  for version in 2.14 2.15 2.16 2.17; do
+    cp ignore-2.10.txt ignore-${version}.txt
+  done
+}
+
 # sanity-test runs ansible-test tool with sanity checks.
 function sanity-test {
   install-local-collection
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index a4d2f23..94ae21a 100644
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -1,21 +1,20 @@
 plugins/httpapi/srlinux.py validate-modules:missing-gplv3-license
-plugins/httpapi/srlinux.py validate-modules:import-before-documentation
-plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.6+
+plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.10+
 plugins/modules/cli.py import-3.5!skip
+plugins/modules/cli.py import-3.6!skip
+plugins/modules/cli.py import-3.7!skip
+plugins/modules/cli.py import-3.8!skip
+plugins/modules/cli.py import-3.9!skip
 plugins/modules/cli.py validate-modules:missing-gplv3-license
-plugins/modules/cli.py validate-modules:import-before-documentation
 plugins/modules/get.py import-2.7!skip
 plugins/modules/get.py import-3.5!skip
 plugins/modules/get.py validate-modules:missing-gplv3-license
-plugins/modules/get.py validate-modules:import-before-documentation
 plugins/modules/config.py import-2.7!skip
 plugins/modules/config.py import-3.5!skip
 plugins/modules/config.py validate-modules:missing-gplv3-license
-plugins/modules/config.py validate-modules:import-before-documentation
 plugins/modules/validate.py import-2.7!skip
 plugins/modules/validate.py import-3.5!skip
 plugins/modules/validate.py validate-modules:missing-gplv3-license
-plugins/modules/validate.py validate-modules:import-before-documentation
 plugins/module_utils/srlinux.py import-2.7!skip
 plugins/module_utils/srlinux.py import-3.5!skip
 plugins/module_utils/const.py import-2.7!skip
diff --git a/tests/sanity/ignore-2.14.txt b/tests/sanity/ignore-2.14.txt
index a4d2f23..94ae21a 100644
--- a/tests/sanity/ignore-2.14.txt
+++ b/tests/sanity/ignore-2.14.txt
@@ -1,21 +1,20 @@
 plugins/httpapi/srlinux.py validate-modules:missing-gplv3-license
-plugins/httpapi/srlinux.py validate-modules:import-before-documentation
-plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.6+
+plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.10+
 plugins/modules/cli.py import-3.5!skip
+plugins/modules/cli.py import-3.6!skip
+plugins/modules/cli.py import-3.7!skip
+plugins/modules/cli.py import-3.8!skip
+plugins/modules/cli.py import-3.9!skip
 plugins/modules/cli.py validate-modules:missing-gplv3-license
-plugins/modules/cli.py validate-modules:import-before-documentation
 plugins/modules/get.py import-2.7!skip
 plugins/modules/get.py import-3.5!skip
 plugins/modules/get.py validate-modules:missing-gplv3-license
-plugins/modules/get.py validate-modules:import-before-documentation
 plugins/modules/config.py import-2.7!skip
 plugins/modules/config.py import-3.5!skip
 plugins/modules/config.py validate-modules:missing-gplv3-license
-plugins/modules/config.py validate-modules:import-before-documentation
 plugins/modules/validate.py import-2.7!skip
 plugins/modules/validate.py import-3.5!skip
 plugins/modules/validate.py validate-modules:missing-gplv3-license
-plugins/modules/validate.py validate-modules:import-before-documentation
 plugins/module_utils/srlinux.py import-2.7!skip
 plugins/module_utils/srlinux.py import-3.5!skip
 plugins/module_utils/const.py import-2.7!skip
diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt
new file mode 100644
index 0000000..94ae21a
--- /dev/null
+++ b/tests/sanity/ignore-2.15.txt
@@ -0,0 +1,28 @@
+plugins/httpapi/srlinux.py validate-modules:missing-gplv3-license
+plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.10+
+plugins/modules/cli.py import-3.5!skip
+plugins/modules/cli.py import-3.6!skip
+plugins/modules/cli.py import-3.7!skip
+plugins/modules/cli.py import-3.8!skip
+plugins/modules/cli.py import-3.9!skip
+plugins/modules/cli.py validate-modules:missing-gplv3-license
+plugins/modules/get.py import-2.7!skip
+plugins/modules/get.py import-3.5!skip
+plugins/modules/get.py validate-modules:missing-gplv3-license
+plugins/modules/config.py import-2.7!skip
+plugins/modules/config.py import-3.5!skip
+plugins/modules/config.py validate-modules:missing-gplv3-license
+plugins/modules/validate.py import-2.7!skip
+plugins/modules/validate.py import-3.5!skip
+plugins/modules/validate.py validate-modules:missing-gplv3-license
+plugins/module_utils/srlinux.py import-2.7!skip
+plugins/module_utils/srlinux.py import-3.5!skip
+plugins/module_utils/const.py import-2.7!skip
+plugins/module_utils/const.py import-3.5!skip
+plugins/module_utils/const.py compile-2.7!skip
+plugins/module_utils/const.py compile-3.5!skip
+plugins/module_utils/srlinux.py compile-2.7!skip
+plugins/module_utils/srlinux.py compile-3.5!skip
+plugins/module_utils/const.py future-import-boilerplate!skip
+plugins/module_utils/const.py metaclass-boilerplate!skip
+tests/playbooks/golden/clab-ansible-srl.cfg.yml yamllint!skip
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt
new file mode 100644
index 0000000..94ae21a
--- /dev/null
+++ b/tests/sanity/ignore-2.16.txt
@@ -0,0 +1,28 @@
+plugins/httpapi/srlinux.py validate-modules:missing-gplv3-license
+plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.10+
+plugins/modules/cli.py import-3.5!skip
+plugins/modules/cli.py import-3.6!skip
+plugins/modules/cli.py import-3.7!skip
+plugins/modules/cli.py import-3.8!skip
+plugins/modules/cli.py import-3.9!skip
+plugins/modules/cli.py validate-modules:missing-gplv3-license
+plugins/modules/get.py import-2.7!skip
+plugins/modules/get.py import-3.5!skip
+plugins/modules/get.py validate-modules:missing-gplv3-license
+plugins/modules/config.py import-2.7!skip
+plugins/modules/config.py import-3.5!skip
+plugins/modules/config.py validate-modules:missing-gplv3-license
+plugins/modules/validate.py import-2.7!skip
+plugins/modules/validate.py import-3.5!skip
+plugins/modules/validate.py validate-modules:missing-gplv3-license
+plugins/module_utils/srlinux.py import-2.7!skip
+plugins/module_utils/srlinux.py import-3.5!skip
+plugins/module_utils/const.py import-2.7!skip
+plugins/module_utils/const.py import-3.5!skip
+plugins/module_utils/const.py compile-2.7!skip
+plugins/module_utils/const.py compile-3.5!skip
+plugins/module_utils/srlinux.py compile-2.7!skip
+plugins/module_utils/srlinux.py compile-3.5!skip
+plugins/module_utils/const.py future-import-boilerplate!skip
+plugins/module_utils/const.py metaclass-boilerplate!skip
+tests/playbooks/golden/clab-ansible-srl.cfg.yml yamllint!skip
\ No newline at end of file
diff --git a/tests/sanity/ignore-2.17.txt b/tests/sanity/ignore-2.17.txt
new file mode 100644
index 0000000..94ae21a
--- /dev/null
+++ b/tests/sanity/ignore-2.17.txt
@@ -0,0 +1,28 @@
+plugins/httpapi/srlinux.py validate-modules:missing-gplv3-license
+plugins/modules/cli.py import-2.7!skip # srlinux collection requires py3.10+
+plugins/modules/cli.py import-3.5!skip
+plugins/modules/cli.py import-3.6!skip
+plugins/modules/cli.py import-3.7!skip
+plugins/modules/cli.py import-3.8!skip
+plugins/modules/cli.py import-3.9!skip
+plugins/modules/cli.py validate-modules:missing-gplv3-license
+plugins/modules/get.py import-2.7!skip
+plugins/modules/get.py import-3.5!skip
+plugins/modules/get.py validate-modules:missing-gplv3-license
+plugins/modules/config.py import-2.7!skip
+plugins/modules/config.py import-3.5!skip
+plugins/modules/config.py validate-modules:missing-gplv3-license
+plugins/modules/validate.py import-2.7!skip
+plugins/modules/validate.py import-3.5!skip
+plugins/modules/validate.py validate-modules:missing-gplv3-license
+plugins/module_utils/srlinux.py import-2.7!skip
+plugins/module_utils/srlinux.py import-3.5!skip
+plugins/module_utils/const.py import-2.7!skip
+plugins/module_utils/const.py import-3.5!skip
+plugins/module_utils/const.py compile-2.7!skip
+plugins/module_utils/const.py compile-3.5!skip
+plugins/module_utils/srlinux.py compile-2.7!skip
+plugins/module_utils/srlinux.py compile-3.5!skip
+plugins/module_utils/const.py future-import-boilerplate!skip
+plugins/module_utils/const.py metaclass-boilerplate!skip
+tests/playbooks/golden/clab-ansible-srl.cfg.yml yamllint!skip
\ No newline at end of file