Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump 4.9.0 version to 4.9.0 testing branch #40

Merged
merged 1 commit into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/offline-installation/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ function download_resources() {
bash "${ABSOLUTE_PATH}"/wazuh-install.sh -dw "${sys_type}"
echo "INFO: Downloading the resources..."

curl -sO https://packages.wazuh.com/4.10/config.yml
curl -sO https://packages.wazuh.com/4.9/config.yml
check_file "config.yml"

sed -i -e '0,/<indexer-node-ip>/ s/<indexer-node-ip>/127.0.0.1/' config.yml
sed -i -e '0,/<wazuh-manager-ip>/ s/<wazuh-manager-ip>/127.0.0.1/' config.yml
sed -i -e '0,/<dashboard-node-ip>/ s/<dashboard-node-ip>/127.0.0.1/' config.yml

curl -sO https://packages.wazuh.com/4.10/wazuh-certs-tool.sh
curl -sO https://packages.wazuh.com/4.9/wazuh-certs-tool.sh
check_file "wazuh-certs-tool.sh"
chmod 744 wazuh-certs-tool.sh
./wazuh-certs-tool.sh --all
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Test_installation_assistant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
AUTOMATION_REFERENCE:
description: 'wazuh-automation reference'
required: true
default: 'v4.10.0'
default: 'v4.9.0'
SYSTEM:
description: 'Operating System'
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
AUTOMATION_REFERENCE:
description: 'wazuh-automation reference'
required: true
default: 'v4.10.0'
default: 'v4.9.0'
DEBUG:
description: 'Debug mode'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Test_installation_assistant_tier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
AUTOMATION_REFERENCE:
description: 'wazuh-automation reference'
required: true
default: 'v4.10.0'
default: 'v4.9.0'
CentOS_7:
description: 'CentOS 7'
required: true
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ The Wazuh installation assistant uses the following tools to enhance security du
## User Guide

### Downloads
- [Download the Wazuh installation assistant.](https://packages.wazuh.com/4.10/wazuh-install.sh)
- [Download the Wazuh password tool.](https://packages.wazuh.com/4.10/wazuh-passwords-tool.sh)
- [Download the Wazuh cert tool.](https://packages.wazuh.com/4.10/wazuh-certs-tool.sh)
- [Download the Wazuh installation assistant.](https://packages.wazuh.com/4.9/wazuh-install.sh)
- [Download the Wazuh password tool.](https://packages.wazuh.com/4.9/wazuh-passwords-tool.sh)
- [Download the Wazuh cert tool.](https://packages.wazuh.com/4.9/wazuh-certs-tool.sh)

### Build the scripts
As an alternative to downloading, use the `builder.sh` script to build the Wazuh installation assistant and tools:
Expand All @@ -65,14 +65,14 @@ As an alternative to downloading, use the `builder.sh` script to build the Wazuh

## Use Cases

Start by downloading the [configuration file](https://packages.wazuh.com/4.10/config.yml) and replace the node names and IP values with the corresponding ones.
Start by downloading the [configuration file](https://packages.wazuh.com/4.9/config.yml) and replace the node names and IP values with the corresponding ones.

> [!NOTE]
> It is not necessary to download the Wazuh password tool and the Wazuh cert tool to use the Wazuh installation assistant. The Wazuh installation assistant has embedded the previous tools.

### Common commands

1. Generate the passwords and certificates. Needs the [configuration file](https://packages.wazuh.com/4.10/config.yml).
1. Generate the passwords and certificates. Needs the [configuration file](https://packages.wazuh.com/4.9/config.yml).
```bash
bash wazuh-install.sh -g
```
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.10.0
4.9.0
2 changes: 1 addition & 1 deletion builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="4.9.0"

function getHelp() {

Expand Down
4 changes: 2 additions & 2 deletions install_functions/installVariables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# Foundation.

## Package vars
readonly wazuh_major="4.10"
readonly wazuh_version="4.10.0"
readonly wazuh_major="4.9"
readonly wazuh_version="4.9.0"
readonly filebeat_version="7.10.2"
readonly wazuh_install_vesion="0.1"
readonly source_branch="v${wazuh_version}"
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/suites/test-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 4.9.0-1 @wazuh
@mkdir /var/ossec

@mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh
Expand Down Expand Up @@ -105,7 +105,7 @@ 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 4.9.0-1 @wazuh"
@echo 1

@echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh"
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/suites/test-dashboard.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="4.9.0"
elasticsearch_oss_version="7.10.2"
wazuh_kibana_plugin_revision="1"
repobaseurl="https://packages.wazuh.com/4.x"
Expand Down Expand Up @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() {
load-dashboard_install
sys_type="yum"
sep="-"
wazuh_version="4.10.0"
wazuh_version="4.9.0"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -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="4.9.0"
wazuh_revision="1"
@mockfalse yum install wazuh-dashboard-1.13.2-1 -y
dashboard_install
Expand All @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() {
load-dashboard_install
sys_type="apt-get"
sep="="
wazuh_version="4.10.0"
wazuh_version="4.9.0"
wazuh_revision="1"
dashboard_install
}
Expand All @@ -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="4.9.0"
wazuh_revision="1"
@mockfalse apt install wazuh-dashboard=1.13.2-1 -y
dashboard_install
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/suites/test-indexer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ test-03-indexer_install-yum() {
load-indexer_install
sys_type="yum"
sep="-"
wazuh_version="4.10.0"
wazuh_version="4.9.0"
wazuh_revision="1"
indexer_install
}
Expand All @@ -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="4.9.0"
wazuh_revision="1"
@mockfalse yum install wazuh-indexer-1.13.2-1 -y
indexer_install
Expand All @@ -73,7 +73,7 @@ test-05-indexer_install-apt() {
load-indexer_install
sys_type="apt-get"
sep="="
wazuh_version="4.10.0"
wazuh_version="4.9.0"
wazuh_revision="1"
indexer_install
}
Expand All @@ -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="4.9.0"
wazuh_revision="1"
@mockfalse apt install wazuh-indexer=1.13.2-1 -y
indexer_install
Expand Down
Loading