Conflicts resolution

This commit is contained in:
Gonzalo Acuña
2026-07-02 10:57:40 -03:00
27 changed files with 81 additions and 135 deletions
@@ -6,7 +6,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: 'v5.0.0-beta3'
default: '5.0.1'
required: true
docker_reference:
description: 'wazuh-docker reference'
@@ -14,7 +14,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'v5.0.0-beta3'
default: 'main'
products:
description: 'Comma-separated list of the image names to build and push'
default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
@@ -42,7 +42,7 @@ on:
inputs:
image_tag:
description: 'Docker image tag'
default: 'v5.0.0-beta3'
default: '5.0.1'
required: true
type: string
docker_reference:
@@ -52,7 +52,7 @@ on:
wazuh_automation_reference:
description: 'Branch or tag of the wazuh-automation repository'
required: false
default: 'v5.0.0-beta3'
default: 'main'
type: string
products:
description: 'Comma-separated list of the image names to build and push'
@@ -16,7 +16,7 @@ on:
automation_reference:
description: 'Branch of wazuh-automation to use'
required: false
default: 'v5.0.0-beta3'
default: 'main'
type: string
deployment_type:
description: 'Deployment type to test'
@@ -27,7 +27,7 @@ on:
- multi-node
- both
version:
description: 'Image version to test (e.g. 5.0.0).'
description: 'Image version to test (e.g. 5.0.1).'
required: false
type: string
stage: