Merge 4.10.0 into 4.10.1

wazuh · Oct 17, 2024 · 7aa178b · 7aa178b
1 parent f4e98fe
commit 7aa178b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git 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.0'
+ default: '4.10.1'
  AUTOMATION_REFERENCE:
  description: 'Branch or tag of the wazuh-automation repository'
  required: true
- default: '4.10.0'
+ default: '4.10.1'
  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
@@ -23,11 +23,11 @@ on:
  WAZUH_INSTALLATION_ASSISTANT_REFERENCE:
  description: 'Branch or tag of the wazuh-installation-assistant repository'
  required: true
- default: '4.10.0'
+ default: '4.10.1'
  AUTOMATION_REFERENCE:
  description: 'Branch or tag of the wazuh-automation repository'
  required: true
- default: '4.10.0'
+ default: '4.10.1'
  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
@@ -7,7 +7,7 @@ on:
  wazuh_installation_assistant_reference:
  description: "Branch or tag of the wazuh-installation-assistant repository."
  required: true
- default: 4.10.0
+ default: 4.10.1
  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.0
+ default: 4.10.1
  is_stage:
  description: "Is stage?"
  type: boolean
@@ -63,13 +63,13 @@ jobs:
  uses: actions/checkout@v4
  with:
  ref: ${{ inputs.wazuh_installation_assistant_reference }}
- 
+
  - name: Configure aws credentials
  uses: aws-actions/configure-aws-credentials@v3
  with:
  role-to-assume: ${{ secrets.AWS_IAM_ROLE }}
  aws-region: us-east-1
- 
+
  - name: Get short sha and wazuh version
  run: |
  COMMIT_SHORT_SHA=$(git rev-parse --short ${{ github.sha }})
@@ -86,7 +86,7 @@ jobs:
 
  - name: Build Installation Assistant packages
  run: bash builder.sh -i -c -p
- 
+
  - name: Save files name
  run: |
  WAZUH_INSTALL_NAME=$(ls ${{ github.workspace }}/${{ env.WAZUH_INSTALL_NAME }}*.sh | xargs basename)
@@ -102,14 +102,14 @@ jobs:
  mv ${{ env.WAZUH_INSTALL_NAME }} ${{ github.workspace }}/${{ env.WAZUH_VERSION }}
  mv ${{ env.WAZUH_CERT_TOOL_NAME }} ${{ github.workspace }}/${{ env.WAZUH_VERSION }}
  mv ${{ env.WAZUH_PASSWORD_TOOL_NAME }} ${{ github.workspace }}/${{ env.WAZUH_VERSION }}
- 
+
  - name: Build packages checksum
  if: ${{ inputs.checksum == true }}
  run: |
  sha512sum ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_INSTALL_NAME }} > ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_INSTALL_NAME }}.sha512
  sha512sum ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_CERT_TOOL_NAME }} > ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_CERT_TOOL_NAME }}.sha512
  sha512sum ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_PASSWORD_TOOL_NAME }} > ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_PASSWORD_TOOL_NAME }}.sha512
- 
+
  - name: Upload files to S3
  run: |
  aws s3 cp ${{ github.workspace }}/${{ env.WAZUH_VERSION }}/${{ env.WAZUH_INSTALL_NAME }} s3://${{ env.S3_BUCKET }}/${{ env.S3_REPOSITORY_PATH }}/${{ env.WAZUH_VERSION }}/

diff --git 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.0
+ default: 4.10.1
 
 jobs:
  Build-wazuh-install-script:

diff --git 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.0"
+source_branch="v4.10.1"
 
 function getHelp() {
 

diff --git 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.0"
+readonly wazuh_version="4.10.1"
 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
@@ -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.10.1-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 4.10.1-1 @wazuh"
  @echo 1
 
- @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh"
+ @echo "wazuh-indexer.x86_64 4.10.1-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
@@ -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.10.1"
  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="4.10.1"
  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="4.10.1"
  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="4.10.1"
  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="4.10.1"
  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
@@ -49,7 +49,7 @@ test-03-indexer_install-yum() {
  load-indexer_install
  sys_type="yum"
  sep="-"
- wazuh_version="4.10.0"
+ wazuh_version="4.10.1"
  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="4.10.1"
  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="4.10.1"
  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="4.10.1"
  wazuh_revision="1"
  @mockfalse apt install wazuh-indexer=1.13.2-1 -y
  indexer_install