From be698bd70e94f44e25d2c4a2febbe0ae44f7a131 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Mon, 26 Aug 2024 10:48:26 -0300 Subject: [PATCH] Changed 4.10.0 version to 5.0.0 to main branch --- .github/workflows/Test_installation_assistant.yml | 4 ++-- .../Test_installation_assistant_distributed.yml | 2 +- .github/workflows/Test_installation_assistant_tier.yml | 2 +- CHANGELOG.md | 6 ++++++ VERSION | 2 +- builder.sh | 2 +- install_functions/installVariables.sh | 4 ++-- tests/unit/suites/test-common.sh | 6 +++--- tests/unit/suites/test-dashboard.sh | 10 +++++----- tests/unit/suites/test-indexer.sh | 8 ++++---- 10 files changed, 26 insertions(+), 20 deletions(-) diff --git a/.github/workflows/Test_installation_assistant.yml b/.github/workflows/Test_installation_assistant.yml index 6393629..cdc2249 100644 --- a/.github/workflows/Test_installation_assistant.yml +++ b/.github/workflows/Test_installation_assistant.yml @@ -1,5 +1,5 @@ run-name: Test installation assistant - System ${{ inputs.SYSTEM }} - Launched by @${{ github.actor }} -name: Test installation assistant +name: Test installation assistant on: pull_request: @@ -23,7 +23,7 @@ on: AUTOMATION_REFERENCE: description: 'wazuh-automation reference' required: true - default: 'v4.10.0' + default: 'v5.0.0' SYSTEM: description: 'Operating System' required: true diff --git a/.github/workflows/Test_installation_assistant_distributed.yml b/.github/workflows/Test_installation_assistant_distributed.yml index b2d91aa..9a4e809 100644 --- a/.github/workflows/Test_installation_assistant_distributed.yml +++ b/.github/workflows/Test_installation_assistant_distributed.yml @@ -23,7 +23,7 @@ on: AUTOMATION_REFERENCE: description: 'wazuh-automation reference' required: true - default: 'v4.10.0' + default: 'v5.0.0' DEBUG: description: 'Debug mode' required: true diff --git a/.github/workflows/Test_installation_assistant_tier.yml b/.github/workflows/Test_installation_assistant_tier.yml index 32170b0..6ea259a 100644 --- a/.github/workflows/Test_installation_assistant_tier.yml +++ b/.github/workflows/Test_installation_assistant_tier.yml @@ -15,7 +15,7 @@ on: AUTOMATION_REFERENCE: description: 'wazuh-automation reference' required: true - default: 'v4.10.0' + default: 'v5.0.0' CentOS_7: description: 'CentOS 7' required: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e2091..b4cd215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [5.0.0] + +### Changed + +- None + ## [4.10.0] ### Changed diff --git a/VERSION b/VERSION index 2da4316..0062ac9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.10.0 +5.0.0 diff --git a/builder.sh b/builder.sh index f007604..6ab9f6e 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="4.10.0" +source_branch="5.0.0" function getHelp() { diff --git a/install_functions/installVariables.sh b/install_functions/installVariables.sh index 19626c1..de96118 100644 --- a/install_functions/installVariables.sh +++ b/install_functions/installVariables.sh @@ -7,8 +7,8 @@ # Foundation. ## Package vars -readonly wazuh_major="4.10" -readonly wazuh_version="4.10.0" +readonly wazuh_major="5.0" +readonly wazuh_version="5.0.0" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" readonly source_branch="v${wazuh_version}" diff --git a/tests/unit/suites/test-common.sh b/tests/unit/suites/test-common.sh index 30fd60e..31f5a45 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.0-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 5.0.0-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.0-1 @wazuh" + @echo "wazuh-manager.x86_64 5.0.0-1 @wazuh" @echo 1 - @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh" + @echo "wazuh-indexer.x86_64 5.0.0-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 facc0f9..ba81110 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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 7f5ab1e..7e2e831 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" 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.0" + wazuh_version="5.0.0" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install