Skip to content

Commit

Permalink
Bumped branch 4.10.2 to 4.10.2 version
Browse files Browse the repository at this point in the history
  • Loading branch information
c-bordon committed Oct 3, 2024
1 parent 99f78c3 commit de28758
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 40 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/Test_installation_assistant.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run-name: Test installation assistant - ${{ github.run_id }} - ${{ inputs.SYSTEMS }} - Launched by @${{ github.actor }}
name: Test installation assistant
name: Test installation assistant

on:
pull_request:
Expand All @@ -23,7 +23,7 @@ on:
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
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

- name: View parameters
run: echo "${{ toJson(inputs) }}"

- name: Set COMPOSITE_NAME variable
run: |
case "${{ matrix.system }}" in
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Install Ansible
run: sudo apt-get update && sudo apt install -y python3 && python3 -m pip install --user ansible-core==2.16

- name: Set up AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
sed 's/: */=/g' $ALLOCATOR_PATH/inventory.yml > $ALLOCATOR_PATH/inventory_mod.yml
sed -i 's/-o StrictHostKeyChecking=no/\"-o StrictHostKeyChecking=no\"/g' $ALLOCATOR_PATH/inventory_mod.yml
source $ALLOCATOR_PATH/inventory_mod.yml
echo "[gha_instance]" > $ALLOCATOR_PATH/inventory
echo "$ansible_host ansible_port=$ansible_port ansible_user=$ansible_user ansible_ssh_private_key_file=$ansible_ssh_private_key_file ansible_ssh_common_args='$ansible_ssh_common_args'" >> $ALLOCATOR_PATH/inventory
Expand Down Expand Up @@ -186,13 +186,13 @@ jobs:
-e "logs_path=$LOGS_PATH" \
-e "test_name=$TEST_NAME" \
"${{ inputs.VERBOSITY }}"
- name: Compress Allocator VM directory
id: compress_allocator_files
if: always() && steps.allocator_instance.outcome == 'success' && inputs.DESTROY == false
run: |
zip -P "${{ secrets.ZIP_ARTIFACTS_PASSWORD }}" -r $ALLOCATOR_PATH.zip $ALLOCATOR_PATH
- name: Upload Allocator VM directory as artifact
if: always() && steps.compress_allocator_files.outcome == 'success' && inputs.DESTROY == false
uses: actions/upload-artifact@v4
Expand All @@ -203,4 +203,4 @@ jobs:
- name: Delete allocated VM
if: always() && steps.allocator_instance.outcome == 'success' && inputs.DESTROY == true
run: python3 wazuh-automation/deployability/modules/allocation/main.py --action delete --track-output $ALLOCATOR_PATH/track.yml

36 changes: 18 additions & 18 deletions .github/workflows/Test_installation_assistant_distributed.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run-name: (Distributed) Test installation assistant - ${{ github.run_id }} - ${{ inputs.SYSTEMS }} - Launched by @${{ github.actor }}
name: (Distributed) Test installation assistant
name: (Distributed) Test installation assistant

on:
pull_request:
Expand All @@ -23,7 +23,7 @@ on:
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
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:

- name: View parameters
run: echo "${{ toJson(inputs) }}"

- name: Set COMPOSITE_NAME variable
run: |
case "${{ matrix.system }}" in
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Install Ansible
run: sudo apt-get update && sudo apt install -y python3 && python3 -m pip install --user ansible-core==2.16 && pip install pyyaml && ansible-galaxy collection install community.general

- name: Set up AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
echo "[managers]" > $inventory_managers
echo "[dashboards]" > $inventory_dashboards
echo "[all:vars]" > $inventory_common
for i in ${!instance_names[@]}; do
instance_name=${instance_names[$i]}
# Provision instance in parallel
Expand All @@ -178,7 +178,7 @@ jobs:
if [[ $i -eq 0 ]]; then
echo "indexer1 ansible_host=$ansible_host private_ip=$private_ip ansible_ssh_private_key_file=$ansible_ssh_private_key_file" >> $inventory_indexers
echo "master ansible_host=$ansible_host private_ip=$private_ip ansible_ssh_private_key_file=$ansible_ssh_private_key_file manager_type=master instance_type=indexer_manager" >> $inventory_managers
echo "ansible_user=$ansible_user" >> $inventory_common
echo "ansible_port=$ansible_port" >> $inventory_common
echo "ansible_ssh_common_args='$ansible_ssh_common_args'" >> $inventory_common
Expand All @@ -201,7 +201,7 @@ jobs:
cat $inventory_managers >> $inventory_file
cat $inventory_dashboards >> $inventory_file
cat $inventory_common >> $inventory_file
- name: Execute provision playbook
run: |
INSTALL_DEPS=true
Expand All @@ -218,14 +218,14 @@ jobs:
-e "install_python=$INSTALL_PYTHON" \
-e "install_pip_deps=$INSTALL_PIP_DEPS" \
"${{ inputs.VERBOSITY }}"
- name: Execute certificates generation playbook
run: |
ANSIBLE_STDOUT_CALLBACK=$ANSIBLE_CALLBACK ansible-playbook .github/workflows/ansible-playbooks/distributed_generate_certificates.yml \
-i $ALLOCATOR_PATH/inventory \
-e "resources_path=$RESOURCES_PATH" \
"${{ inputs.VERBOSITY }}"
- name: Copy certificates to nodes
run: |
ANSIBLE_STDOUT_CALLBACK=$ANSIBLE_CALLBACK ansible-playbook .github/workflows/ansible-playbooks/distributed_copy_certificates.yml \
Expand All @@ -243,7 +243,7 @@ jobs:
-e "tmp_path=$TMP_PATH" \
-e "pkg_repository=$PKG_REPOSITORY" \
"${{ inputs.VERBOSITY }}"
- name: Execute indexer cluster start playbook
run: |
INDEXER_ADMIN_PASSWORD="admin"
Expand All @@ -253,7 +253,7 @@ jobs:
-e "tmp_path=$TMP_PATH" \
-e "pkg_repository=$PKG_REPOSITORY" \
"${{ inputs.VERBOSITY }}"
- name: Execute server installation playbook
run: |
ANSIBLE_STDOUT_CALLBACK=$ANSIBLE_CALLBACK ansible-playbook .github/workflows/ansible-playbooks/distributed_install_wazuh.yml \
Expand All @@ -262,7 +262,7 @@ jobs:
-e "tmp_path=$TMP_PATH" \
-e "pkg_repository=$PKG_REPOSITORY" \
"${{ inputs.VERBOSITY }}"
- name: Execute dashboard installation playbook
run: |
ANSIBLE_STDOUT_CALLBACK=$ANSIBLE_CALLBACK ansible-playbook .github/workflows/ansible-playbooks/distributed_install_dashboard.yml \
Expand All @@ -271,7 +271,7 @@ jobs:
-e "tmp_path=$TMP_PATH" \
-e "pkg_repository=$PKG_REPOSITORY" \
"${{ inputs.VERBOSITY }}"
- name: Execute Python test playbook
run: |
ANSIBLE_STDOUT_CALLBACK=$ANSIBLE_CALLBACK ansible-playbook .github/workflows/ansible-playbooks/distributed_tests.yml \
Expand All @@ -280,13 +280,13 @@ jobs:
-e "tmp_path=$TMP_PATH" \
-e "test_name=$TEST_NAME" \
"${{ inputs.VERBOSITY }}"
- name: Compress Allocator VM directory
id: compress_allocator_files
if: always() && steps.allocator_instance.outcome == 'success' && inputs.DESTROY == false
run: |
zip -P "${{ secrets.ZIP_ARTIFACTS_PASSWORD }}" -r $ALLOCATOR_PATH.zip $ALLOCATOR_PATH
- name: Upload Allocator VM directory as artifact
if: always() && steps.compress_allocator_files.outcome == 'success' && inputs.DESTROY == false
uses: actions/upload-artifact@v4
Expand All @@ -298,13 +298,13 @@ jobs:
if: always() && steps.allocator_instance.outcome == 'success' && inputs.DESTROY == true
run: |
instance_names=($INSTANCE_NAMES)
for i in ${!instance_names[@]}; do
instance_name=${instance_names[$i]}
track_file="$ALLOCATOR_PATH/track_${instance_name}.yml"
echo "Deleting instance: $instance_name using track file $track_file"
(
# Delete instance
python3 wazuh-automation/deployability/modules/allocation/main.py \
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# Change Log
All notable changes to this project will be documented in this file.

## [4.10.2]

### Added

- None

### Changed

- None

### Fixed

- None

### Deleted

- None

## [4.10.1]

### Added
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.10.1
4.10.2
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="v4.10.1"
source_branch="v4.10.2"

function getHelp() {

Expand Down
2 changes: 1 addition & 1 deletion install_functions/installVariables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
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.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
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.1-1 @wazuh"
@echo "wazuh-manager.x86_64 4.10.2-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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
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.1"
wazuh_version="4.10.2"
wazuh_revision="1"
@mockfalse apt install wazuh-indexer=1.13.2-1 -y
indexer_install
Expand Down

0 comments on commit de28758

Please sign in to comment.