From 13b9b643326c4fa6d3c16f51b12f84d2d40ad727 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Thu, 17 Oct 2024 12:52:27 -0300 Subject: [PATCH] Merge 4.10.1 into 4.10.2 --- .github/workflows/Test_installation_assistant.yml | 4 ++-- .../Test_installation_assistant_distributed.yml | 4 ++-- .github/workflows/builder_installation_assistant.yml | 4 ++-- .github/workflows/offline-installation.yml | 2 +- VERSION | 2 +- builder.sh | 2 +- install_functions/installVariables.sh | 2 +- tests/unit/suites/test-common.sh | 6 +++--- tests/unit/suites/test-dashboard.sh | 10 +++++----- tests/unit/suites/test-indexer.sh | 8 ++++---- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/Test_installation_assistant.yml b/.github/workflows/Test_installation_assistant.yml index 3eab02f..09f9158 100644 --- a/.github/workflows/Test_installation_assistant.yml +++ b/.github/workflows/Test_installation_assistant.yml @@ -23,11 +23,11 @@ on: WAZUH_INSTALLATION_ASSISTANT_REFERENCE: description: 'Branch or tag of the wazuh-installation-assistant repository' required: true - default: '4.10.1' + default: '4.10.2' AUTOMATION_REFERENCE: description: 'Branch or tag of the wazuh-automation repository' required: true - default: '4.10.1' + default: '4.10.2' SYSTEMS: description: 'Operating Systems (list of comma-separated quoted strings enclosed in square brackets)' required: true diff --git a/.github/workflows/Test_installation_assistant_distributed.yml b/.github/workflows/Test_installation_assistant_distributed.yml index bc80f6e..75215dc 100644 --- a/.github/workflows/Test_installation_assistant_distributed.yml +++ b/.github/workflows/Test_installation_assistant_distributed.yml @@ -23,11 +23,11 @@ on: WAZUH_INSTALLATION_ASSISTANT_REFERENCE: description: 'Branch or tag of the wazuh-installation-assistant repository' required: true - default: '4.10.1' + default: '4.10.2' AUTOMATION_REFERENCE: description: 'Branch or tag of the wazuh-automation repository' required: true - default: '4.10.1' + default: '4.10.2' SYSTEMS: description: 'Operating Systems (list of comma-separated quoted strings enclosed in square brackets)' required: true diff --git a/.github/workflows/builder_installation_assistant.yml b/.github/workflows/builder_installation_assistant.yml index 0414b05..2446b8e 100644 --- a/.github/workflows/builder_installation_assistant.yml +++ b/.github/workflows/builder_installation_assistant.yml @@ -7,7 +7,7 @@ on: wazuh_installation_assistant_reference: description: "Branch or tag of the wazuh-installation-assistant repository." required: true - default: 4.10.1 + default: 4.10.2 is_stage: description: "Is stage?" type: boolean @@ -26,7 +26,7 @@ on: description: "Branch or tag of the wazuh-installation-assistant repository." type: string required: true - default: 4.10.1 + default: 4.10.2 is_stage: description: "Is stage?" type: boolean diff --git a/.github/workflows/offline-installation.yml b/.github/workflows/offline-installation.yml index 3e841b6..915397f 100644 --- a/.github/workflows/offline-installation.yml +++ b/.github/workflows/offline-installation.yml @@ -9,7 +9,7 @@ on: WAZUH_INSTALLATION_ASSISTANT_REFERENCE: description: "Branch or tag of the wazuh-installation-assistant repository." required: true - default: 4.10.1 + default: 4.10.2 jobs: Build-wazuh-install-script: diff --git a/VERSION b/VERSION index ad96464..0216ba3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.10.1 +4.10.2 diff --git a/builder.sh b/builder.sh index 95d1b63..0b7638a 100755 --- a/builder.sh +++ b/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -source_branch="v4.10.1" +source_branch="v4.10.2" function getHelp() { diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 229153a..20e4a43 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.10" -readonly wazuh_version="4.10.1" +readonly wazuh_version="4.10.2" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" source_branch="v${wazuh_version}" diff --git a/tests/unit/suites/test-common.sh b/tests/unit/suites/test-common.sh index 6f13fe4..faa2d83 100644 --- a/tests/unit/suites/test-common.sh +++ b/tests/unit/suites/test-common.sh @@ -61,7 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() { @mocktrue yum list installed - @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.10.1-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.10.2-1 @wazuh @mkdir /var/ossec @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh @@ -105,10 +105,10 @@ test-04-common_checkInstalled-all-installed-yum() { } test-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.10.1-1 @wazuh" + @echo "wazuh-manager.x86_64 4.10.2-1 @wazuh" @echo 1 - @echo "wazuh-indexer.x86_64 4.10.1-1 @wazuh" + @echo "wazuh-indexer.x86_64 4.10.2-1 @wazuh" @echo 1 @echo "filebeat.x86_64 7.10.2-1 @wazuh" diff --git a/tests/unit/suites/test-dashboard.sh b/tests/unit/suites/test-dashboard.sh index 707d200..d0dfa96 100644 --- a/tests/unit/suites/test-dashboard.sh +++ b/tests/unit/suites/test-dashboard.sh @@ -6,7 +6,7 @@ source "${base_dir}"/bach.sh @setup-test { @ignore common_logger k_certs_path="/etc/wazuh-dashboard/certs/" - wazuh_version="4.10.1" + wazuh_version="4.10.2" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unit/suites/test-indexer.sh b/tests/unit/suites/test-indexer.sh index cdaf053..808fa44 100644 --- a/tests/unit/suites/test-indexer.sh +++ b/tests/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.10.1" + wazuh_version="4.10.2" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install