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.

Sign up for GitHub

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.10.3 branch to 4.10.3 version #172

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Bump 4.10.3 branch to 4.10.3 version #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .github/workflows/Test_installation_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ on:
WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
description: 'Branch or tag of the wazuh-installation-assistant repository'
required: true
default: '4.10.2'
default: '4.10.3'
AUTOMATION_REFERENCE:
description: 'Branch or tag of the wazuh-automation repository'
required: true
default: '4.10.2'
default: '4.10.3'
SYSTEMS:
description: 'Operating Systems (list of comma-separated quoted strings enclosed in square brackets)'
required: true
Expand All @@ -51,7 +51,7 @@ on:

env:
WAZUH_INSTALLATION_ASSISTANT_REFERENCE: ${{ github.event_name == 'pull_request' && github.head_ref || inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
AUTOMATION_REFERENCE: ${{ github.event_name == 'pull_request' && '4.10.2' || inputs.AUTOMATION_REFERENCE }}
AUTOMATION_REFERENCE: ${{ github.event_name == 'pull_request' && '4.10.3' || inputs.AUTOMATION_REFERENCE }}
VERBOSITY: ${{ github.event_name == 'pull_request' && '-v' || inputs.VERBOSITY }}
COMPOSITE_NAME: "linux-SUBNAME-amd64"
SESSION_NAME: "Installation-Assistant-Test"
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
esac
COMPOSITE_NAME="${COMPOSITE_NAME/SUBNAME/$SUBNAME}"
echo "COMPOSITE_NAME=$COMPOSITE_NAME" >> $GITHUB_ENV

- name: Install python and create virtual environment
run: |
sudo apt-get update
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Test_installation_assistant_distributed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ on:
WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
description: 'Branch or tag of the wazuh-installation-assistant repository'
required: true
default: '4.10.2'
default: '4.10.3'
AUTOMATION_REFERENCE:
description: 'Branch or tag of the wazuh-automation repository'
required: true
default: '4.10.2'
default: '4.10.3'
SYSTEMS:
description: 'Operating Systems (list of comma-separated quoted strings enclosed in square brackets)'
required: true
Expand All @@ -51,7 +51,7 @@ on:

env:
WAZUH_INSTALLATION_ASSISTANT_REFERENCE: ${{ github.event_name == 'pull_request' && github.head_ref || inputs.WAZUH_INSTALLATION_ASSISTANT_REFERENCE }}
AUTOMATION_REFERENCE: ${{ github.event_name == 'pull_request' && '4.10.2' || inputs.AUTOMATION_REFERENCE }}
AUTOMATION_REFERENCE: ${{ github.event_name == 'pull_request' && '4.10.3' || inputs.AUTOMATION_REFERENCE }}
VERBOSITY: ${{ github.event_name == 'pull_request' && '-v' || inputs.VERBOSITY }}
COMPOSITE_NAME: "linux-SUBNAME-amd64"
SESSION_NAME: "Installation-Assistant-Test"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/builder_installation_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
wazuh_installation_assistant_reference:
description: "Branch or tag of the wazuh-installation-assistant repository."
required: true
default: 4.10.2
default: 4.10.3
is_stage:
description: "Is stage?"
type: boolean
Expand All @@ -26,7 +26,7 @@ on:
description: "Branch or tag of the wazuh-installation-assistant repository."
type: string
required: true
default: 4.10.2
default: 4.10.3
is_stage:
description: "Is stage?"
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/offline-installation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
description: "Branch or tag of the wazuh-installation-assistant repository."
required: true
default: 4.10.2
default: 4.10.3

jobs:
Build-wazuh-install-script:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Change Log
All notable changes to this project will be documented in this file.

## [4.10.2]
## [4.10.3]

### Added

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.10.2
4.10.3
2 changes: 1 addition & 1 deletion install_functions/installVariables.sh
View file
Open in desktop
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.2"
readonly wazuh_version="4.10.3"
readonly filebeat_version="7.10.2"
readonly wazuh_install_vesion="0.1"
source_branch="v${wazuh_version}"
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/suites/test-common.sh
View file
Open in desktop
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.2-1 @wazuh
@mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.10.3-1 @wazuh
@mkdir /var/ossec

@mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh
Expand Down Expand Up @@ -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.2-1 @wazuh"
@echo "wazuh-manager.x86_64 4.10.3-1 @wazuh"
@echo 1

@echo "wazuh-indexer.x86_64 4.10.2-1 @wazuh"
@echo "wazuh-indexer.x86_64 4.10.3-1 @wazuh"
@echo 1

@echo "filebeat.x86_64 7.10.2-1 @wazuh"
Expand Down
10 changes: 5 additions & 5 deletions tests/unit/suites/test-dashboard.sh
View file
Open in desktop
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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
View file
Open in desktop
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
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.2"
wazuh_version="4.10.3"
wazuh_revision="1"
@mockfalse apt install wazuh-indexer=1.13.2-1 -y
indexer_install
Expand Down
Loading