From 9d56dc051ed7575147229770b7be07a688b72160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 15 Apr 2026 15:00:53 -0300 Subject: [PATCH] GH issue creation changes --- .../Procedure_push_docker_images.yml | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index c1eead7b..a46e67e0 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -86,6 +86,7 @@ jobs: outputs: WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }} + ALL_PRODUCTS_SELECTED: ${{ steps.compute-outputs.outputs.ALL_PRODUCTS_SELECTED }} steps: - name: Print inputs @@ -110,22 +111,24 @@ jobs: - name: Set up variables id: compute-outputs run: | - if [[ "${{ inputs.products }}" != "null" && "${{ inputs.products }}" != "" ]]; then - # Convert comma-separated list to JSON array format - IFS=',' read -ra COMPONENTS <<< "${{ inputs.products }}" - JSON_ARRAY="[" - for i in "${!COMPONENTS[@]}"; do - if [ $i -gt 0 ]; then - JSON_ARRAY+="," - fi - JSON_ARRAY+="\"${COMPONENTS[$i]}\"" - done - JSON_ARRAY+="]" - echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT - else - echo "WAZUH_COMPONENTS=[\"wazuh-manager\",\"wazuh-dashboard\",\"wazuh-indexer\",\"wazuh-agent\"]" >> $GITHUB_OUTPUT + # Use the default list if products is empty + PRODUCTS="${{ inputs.products }}" + if [[ -z "$PRODUCTS" || "$PRODUCTS" == "null" ]]; then + PRODUCTS="wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent" fi + # Check if all 4 core components are present in the string + if [[ "$PRODUCTS" == *"wazuh-manager"* && "$PRODUCTS" == *"wazuh-dashboard"* && "$PRODUCTS" == *"wazuh-indexer"* && "$PRODUCTS" == *"wazuh-agent"* ]]; then + echo "ALL_PRODUCTS_SELECTED=true" >> $GITHUB_OUTPUT + else + echo "ALL_PRODUCTS_SELECTED=false" >> $GITHUB_OUTPUT + fi + + # Convert to JSON for the matrix (Your existing logic) + IFS=',' read -ra COMPONENTS <<< "$PRODUCTS" + JSON_ARRAY=$(printf '%s\n' "${COMPONENTS[@]}" | jq -R . | jq -s -c .) + echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT + build-and-push: runs-on: ubuntu-22.04 @@ -211,11 +214,19 @@ jobs: fi working-directory: ./build-docker-images + + notify: + runs-on: ubuntu-22.04 + needs: [setup, build-and-push] + # Only run if NOT dev AND all products were selected + if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} + + steps: - name: Image exists validation - if: ${{ inputs.dev == false }} id: validation run: | IMAGE_TAG=${{ inputs.image_tag }} + IMAGE_REGISTRY="${{ vars.IMAGE_REGISTRY_PROD }}" PURPOSE="" if [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then