From d3748916600f13efa2369cd75cd5e226abbac02d Mon Sep 17 00:00:00 2001 From: Carlos Bordon Date: Thu, 19 Mar 2026 15:30:34 -0300 Subject: [PATCH] Added assistant revision input to the build workflow --- .github/workflows/5_pr_check.yml | 3 ++- .../Procedure_push_docker_images.yml | 26 +++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 4bb70d5a..f2d659ed 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -45,7 +45,8 @@ jobs: image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} docker_reference: ${{ github.head_ref || inputs.docker_reference }} wazuh_automation_reference: 'main' - commit_list: '["latest", "latest", "latest", "latest", "latest"]' + commit_list: '["latest", "latest", "latest", "latest"]' + assistant_revision: 'latest' id: ${{ github.run_id }} dev: true diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index f0f5a50a..9ee8e27b 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -17,13 +17,18 @@ on: default: 'main' products: description: 'Comma-separated list of the image names to build and push' - default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent,wazuh-assistant' + default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' required: false type: string commit_list: description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product' type: string - default: '["latest", "latest", "latest", "latest", "latest"]' + default: '["latest", "latest", "latest", "latest"]' + assistant_revision: + description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)' + type: string + default: 'latest' + required: false id: description: "ID used to identify the workflow uniquely." type: string @@ -51,13 +56,18 @@ on: type: string products: description: 'Comma-separated list of the image names to build and push' - default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent,wazuh-assistant' + default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent' required: false type: string commit_list: description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product' type: string - default: '["latest", "latest", "latest", "latest", "latest"]' + default: '["latest", "latest", "latest", "latest"]' + assistant_revision: + description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)' + type: string + default: 'latest' + required: false id: description: "ID used to identify the workflow uniquely." type: string @@ -95,9 +105,11 @@ jobs: echo "* id: ${{ inputs.id }}" echo "* image_tag: ${{ inputs.image_tag }}" echo "* docker_reference: ${{ inputs.docker_reference }}" + echo "* wazuh_automation_reference: ${{ inputs.wazuh_automation_reference }}" echo "* products: ${{ inputs.products }}" echo "* dev: ${{ inputs.dev }}" echo "* commit_list: ${{ inputs.commit_list }}" + echo "* assistant_revision: ${{ inputs.assistant_revision }}" echo "---------------------------------------------" - name: Set up variables @@ -117,7 +129,7 @@ jobs: done WC_JSON_ARRAY+="]" else - WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent","wazuh-assistant"]' + WC_JSON_ARRAY='["wazuh-manager","wazuh-dashboard","wazuh-indexer","wazuh-agent"]' fi echo "Products to build: $WC_JSON_ARRAY" echo "WAZUH_COMPONENTS=$WC_JSON_ARRAY" >> $GITHUB_OUTPUT @@ -155,6 +167,7 @@ jobs: PRESIGNED_URLS_SCRIPT_PROCESS: "build_docker" LOCAL_ARTIFACT_URLS_FILEPATH: /tmp/artifact_urls.yml COMMIT_LIST: ${{ inputs.commit_list }} + ASSISTANT_REVISION: ${{ inputs.assistant_revision }} steps: - name: Checkout repository @@ -250,9 +263,6 @@ jobs: wazuh-agent) AGENT_REVISION="${REVISIONS[$i]}" ;; - wazuh-assistant) - ASSISTANT_REVISION="${REVISIONS[$i]}" - ;; esac done