Add qa-ctl v0.3

deps/wazuh_testing/setup.py

@@ -20,7 +20,8 @@
     'data/sslmanager.key',
     'data/sslmanager.cert',
     'tools/macos_log/log_generator.m',
-    'qa_docs/config.yaml',
+    'qa_docs/schema.yaml',
+    'qa_docs/VERSION.json'
     'qa_ctl/deployment/dockerfiles/*',
     'qa_ctl/deployment/dockerfiles/qa_ctl/*',
     'qa_ctl/deployment/vagrantfile_template.txt',
@@ -44,11 +45,11 @@ def get_files_from_directory(directory):
     paths = []
     for (path, directories, filenames) in os.walk(directory):
         for filename in filenames:
-            paths.append(os.path.join(path, filename))
+            paths.append(os.path.join('..', path, filename))
     return paths
 
 
-package_data_list.extend(get_files_from_directory('wazuh_testing/qa_docs/search_ui/'))
+package_data_list.extend(get_files_from_directory('wazuh_testing/qa_docs/search_ui'))
 
 setup(name='wazuh_testing',
       version='4.3.0',
@@ -63,3 +64,4 @@ def get_files_from_directory(directory):
       include_package_data=True,
       zip_safe=False
       )
+

deps/wazuh_testing/wazuh_testing/data/qactl_conf_validator_schema.json

@@ -9,7 +9,7 @@
       "$id": "#/properties/deployment",
       "type": "object",
       "patternProperties": {
-        "^host[0-9]*$": {
+        "^host_[0-9]*$": {
           "type": "object",
           "properties": {
             "provider": {
@@ -48,7 +48,8 @@
                       "type": "string"
                     },
                     "vm_system": {
-                      "type": "string"
+                      "type": "string",
+                      "enum": ["linux","windows"]
                     },
                     "label": {
                       "type": "string"
@@ -117,7 +118,7 @@
       "properties": {
         "hosts": {
           "patternProperties": {
-            "^host[0-9]*$": {
+            "^host_[0-9]*$": {
               "type": "object",
               "required": [
                 "host_info"
@@ -126,31 +127,49 @@
                 "host_info": {
                   "type": "object",
                   "required": [
-                    "connection_method",
-                    "host",
-                    "user",
-                    "password",
-                    "connection_port",
-                    "ansible_python_interpreter"
+                    "ansible_connection",
+                    "ansible_user",
+                    "ansible_password",
+                    "ansible_port",
+                    "system",
+                    "installation_files_path",
+                    "ansible_python_interpreter",
+                    "host"
                   ],
                   "properties": {
-                    "connection_method": {
+                    "ansible_connection": {
                       "type": "string"
                     },
                     "host": {
                       "type": "string"
                     },
-                    "user": {
+                    "ansible_user": {
                       "type": "string"
                     },
-                    "password": {
+                    "ansible_password": {
                       "type": "string"
                     },
-                    "connection_port": {
+                    "ansible_port": {
                       "type": "integer"
                     },
                     "ansible_python_interpreter": {
                       "type": "string"
+                    },
+                    "installation_files_path": {
+                      "type": "string"
+                    },
+                    "system": {
+                      "type": "string",
+                      "enum": [
+                      "rpm",
+                      "deb",
+                      "windows",
+                      "macos",
+                      "solaris10",
+                      "solaris11",
+                      "rpm5",
+                      "wpk-linux",
+                      "wpk-windows"]
                     }
                   }
                 },
@@ -159,7 +178,8 @@
                   "required": [
                     "type",
                     "target",
-                    "installation_files_path"
+                    "installation_files_path",
+                    "wazuh_install_path"
                   ],
                   "properties": {
                     "type": {
@@ -252,49 +272,127 @@
         }
       }
     },
+    "tasks": {
+      "type": "object",
+      "patternProperties": {
+        "^task_[0-9]*$": {
+          "type": "object",
+          "required": ["host_info", "playbooks"],
+          "properties": {
+            "host_info": {
+              "type": "object",
+              "required": [
+                "ansible_connection",
+                "ansible_user",
+                "ansible_port",
+                "ansible_python_interpreter",
+                "host",
+                "system"
+              ],
+              "properties": {
+                "ansible_connection": {
+                  "type" : "string"
+                },
+                "host": {
+                  "type" : "string"
+                },
+                "ansible_user": {
+                  "type": "string"
+                },
+                "ansible_password": {
+                  "type": "string",
+                  "default": "empty"
+                },
+                "ssh_private_key_file_path":{
+                  "type": "string"
+                },
+                "ansible_port": {
+                  "type": "integer"
+                },
+                "ansible_python_interpreter": {
+                  "type": "string"
+                },
+                "system": {
+                  "type": "string"
+                }
+              },
+              "oneOf": [
+                {
+                  "required": ["ansible_password"]
+                },
+                {
+                  "required": ["ssh_private_key_file_path"]
+                }
+              ]
+            },
+            "playbooks": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  {
+                    "required": ["local_path"]
+                  },
+                  {
+                    "required": ["remote_url"]
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
     "tests": {
       "type": "object",
       "patternProperties": {
-        "^host[0-9]*$": {
+        "^host_[0-9]*$": {
           "type": "object",
           "required": ["host_info", "test"],
           "properties": {
             "host_info": {
               "type": "object",
               "required": [
-                "connection_method",
+                "ansible_connection",
+                "ansible_user",
+                "ansible_port",
+                "installation_files_path",
+                "ansible_python_interpreter",
                 "host",
-                "user",
-                "connection_port",
-                "ansible_python_interpreter"
+                "system"
               ],
               "properties": {
-                "connection_method": {
+                "ansible_connection": {
                   "type" : "string"
                 },
                 "host": {
                   "type" : "string"
                 },
-                "user": {
+                "ansible_user": {
                   "type": "string"
                 },
-                "password": {
+                "ansible_password": {
                   "type": "string",
                   "default": "empty"
                 },
                 "ssh_private_key_file_path":{
                   "type": "string"
                 },
-                "connection_port": {
+                "ansible_port": {
                   "type": "integer"
                 },
                 "ansible_python_interpreter": {
                   "type": "string"
+                },
+                "installation_files_path": {
+                  "type": "string"
+                },
+                "system": {
+                  "type": "string"
                 }
               },
               "oneOf": [
                 {
-                  "required": ["password"]
+                  "required": ["ansible_password"]
                 },
                 {
                   "required": ["ssh_private_key_file_path"]
@@ -303,7 +401,10 @@
             },
             "test": {
               "type": "object",
-              "required": ["path"],
+              "required": [
+                "path",
+                "type"
+              ],
               "properties": {
                 "hosts": {
                   "type": "string"
@@ -367,30 +468,33 @@
           }
         }
       }
-    }
-  },
-  "config": {
-    "$id": "#/properties/config",
-    "type": "object",
-    "patternProperties": {
-      "vagrant_output": {
-        "type": "boolean"
-      },
-      "ansible_output": {
-        "type": "boolean"
-      },
-      "logging":{
-        "type": "object",
-        "properties": {
-          "enable": {
-            "type": "boolean"
-          },
-          "level": {
-            "type": "string",
-            "enum": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
-          },
-          "file": {
-            "type": "string"
+    },
+    "config": {
+      "$id": "#/properties/config",
+      "type": "object",
+      "patternProperties": {
+        "qa_ctl_launcher_branch": {
+          "type": "string"
+        },
+        "vagrant_output": {
+          "type": "boolean"
+        },
+        "ansible_output": {
+          "type": "boolean"
+        },
+        "logging":{
+          "type": "object",
+          "properties": {
+            "enable": {
+              "type": "boolean"
+            },
+            "level": {
+              "type": "string",
+              "enum": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+            },
+            "file": {
+              "type": "string"
+            }
           }
         }
       }

deps/wazuh_testing/wazuh_testing/qa_ctl/CHANGELOG.md

@@ -1,8 +1,54 @@
 # Change Log
 All notable changes to this tool will be documented in this file.
 
+## [v0.3] - 2021-12-10
+
+### Added
+
+- Added new module to be able to launch custom ansible tasks with `qa-ctl`.
+- Added new methods to avoid the SSH fingerprint check ansible error.
+- Added generation of independent configuration blocks for instance and task deployment.
+- Added CentOS 7 support.
+### Changed
+
+- Improved modularization of functions for reading data from ansible instances.
+
+
+### Fixed
+
+- Fixed some typos in qa-ctl logs.
+- Fixed some uses of UNIX libraries in `file` module under Windows.
+
+
+## [v0.2] - 2021-11-05
+
+### Added
+- Added operating systems validation for specified OS in tests ([#2168](https://github.com/wazuh/wazuh-qa/pull/2168))
+- Added Windows testing support in `qa-ctl` ([#2152](https://github.com/wazuh/wazuh-qa/pull/2152))
+- Updated `qa-docs` usage in `qa-ctl` ([#2081](https://github.com/wazuh/wazuh-qa/pull/2081))
+- Added `--os` parameter to specify the systems where to launch the tests ([#2064](https://github.com/wazuh/wazuh-qa/pull/2064))
+- Added no-validation flag for `qa-ctl` docker run on windows ([#2028](https://github.com/wazuh/wazuh-qa/pull/2028))
+- Added documentation tests validation precondition for automatic mode ([#2023](https://github.com/wazuh/wazuh-qa/issues/2023))
+
+
+### Changed
+- Updated `JSON Schema validator` ([#2164](https://github.com/wazuh/wazuh-qa/issues/2164))
+- Removed `pytest` error traceback test results ([#2156](https://github.com/wazuh/wazuh-qa/pull/2156))
+- Updated `local internal options` configutation of Wazuh ([#2102](https://github.com/wazuh/wazuh-qa/pull/2102))
+- Replaced `git clone` usage for direct downloads ([#2046](https://github.com/wazuh/wazuh-qa/pull/2046))
+- Changed `GitHub API requests` with `checks on resource URLs` for qa-ctl parameter validations ([#2033](https://github.com/wazuh/wazuh-qa/pull/2033))
+- Renamed `qa-ctl` temporary files directory ([#2029](https://github.com/wazuh/wazuh-qa/pull/2029))
+- Updated `qa-ctl` help menu information ([#2026](https://github.com/wazuh/wazuh-qa/pull/2026))
+
+
+### Fixed
+- Fixed `Docker` issues for `qa-ctl` (manual mode) in `Windows` ([#2147](https://github.com/wazuh/wazuh-qa/pull/2147))
+- Fixed `qa-ctl` configuration path separators for `windows` ([#2036](https://github.com/wazuh/wazuh-qa/pull/2036))
+
+
 ## [v0.1]
 
+
 ### Added
   - Added new folder level for temporary files ([#1993](https://github.com/wazuh/wazuh-qa/pull/1993))
   - Added new implementation for generating `qa-ctl` configuration paths ([#1982](https://github.com/wazuh/wazuh-qa/pull/1982))

deps/wazuh_testing/wazuh_testing/qa_ctl/VERSION.json

@@ -1,4 +1,4 @@
 {
-    "version": "0.1",
+    "version": "0.3",
     "revision": 1
 }