From ea05bb5207490fa0336fbbcbec9c2fe950fcc2ba Mon Sep 17 00:00:00 2001
From: Victor Carlos Erenu <victor.erenu@wazuh.com>
Date: Thu, 25 Dec 2025 19:37:13 +0700
Subject: [PATCH] Modify Wazuh manager test

---
 .github/workflows/push.yml | 72 ++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 7ba05f0c..1c2ddf9c 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -33,16 +33,21 @@ jobs:
 
 
   build-images:
+    runs-on: ubuntu-latest
     needs: prepare-variables
-    uses: ./.github/workflows/Procedure_push_docker_images.yml
-    secrets: inherit
-    with:
-      image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
-      docker_reference: ${{ github.head_ref }}
-      revision: ${{ needs.prepare-variables.outputs.WAZUH_TAG_REVISION }}
-      reference: "latest"
-      id: ${{ github.run_id }}
-      dev: true
+    steps:
+
+      - name: Build step
+        run: echo "Build Docker images here"
+#    uses: ./.github/workflows/Procedure_push_docker_images.yml
+#    secrets: inherit
+#    with:
+#      image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
+#      docker_reference: ${{ github.head_ref }}
+#      revision: ${{ needs.prepare-variables.outputs.WAZUH_TAG_REVISION }}
+#      reference: "latest"
+#      id: ${{ github.run_id }}
+#      dev: true
 
   Execute-Goss-tests:
     needs: [prepare-variables, build-images]
@@ -91,6 +96,7 @@ jobs:
       INDEXER_PASSWORD: admin
       API_USERNAME: wazuh-wui
       API_PASSWORD: MyS3cr37P450r.*-
+      MANAGER_NODES: "manager"
     steps:
 
     - name: Check out code
@@ -236,15 +242,16 @@ jobs:
 
     - name: Check Wazuh manager start
       run: | 
-        services="`curl -k -s -X GET "https://0.0.0.0:55000/cluster/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
-        if [[ $services -gt 9 ]]; then
-          echo "Wazuh Manager Services: ${services}"
-          echo "OK"
-        else
-          echo "Wazuh indexer nodes: ${nodes}"
-          curl -k -X GET "https://0.0.0.0:55000/cluster/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
-          exit 1
-        fi
+        for NODE in "${{ env.MANAGER_NODES }}"; do
+          services="`curl -k -s -X GET "https://0.0.0.0:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
+          if [[ $services -gt 9 ]]; then
+            echo "Wazuh Manager $NODE Services: ${services}"
+            echo "OK"
+          else
+            curl -k -X GET "https://0.0.0.0:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
+            exit 1
+          fi
+        done
       env:
         TOKEN: $(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
     - name: Check Wazuh dashboard service URL
@@ -313,6 +320,7 @@ jobs:
       INDEXER_PASSWORD: admin
       API_USERNAME: wazuh-wui
       API_PASSWORD: MyS3cr37P450r.*-
+      MANAGER_NODES: "master worker"
     steps:
 
     - name: Check out code
@@ -466,23 +474,17 @@ jobs:
        fi
 
     - name: Check Wazuh manager start
-      run: |
-        services="`curl -k -s -X GET "https://0.0.0.0:55000/clsuter/manager/status?pretty=true" -H  "Authorization: Bearer ${{ env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
-        if [[ $services -gt 10 ]]; then
-          echo "Wazuh Manager Services: ${services}"
-          echo "OK"
-        else
-          echo "Wazuh indexer nodes: ${nodes}"
-          curl -k -s -X GET "https://0.0.0.0:55000/cluster/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
-          exit 1
-        fi
-        nodes=$(curl -k -s -X GET "https://0.0.0.0:55000/cluster/nodes" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r ".data.affected_items[].name" | wc -l)
-        if [[ $nodes -eq 2 ]]; then
-         echo "Wazuh manager nodes: ${nodes}"
-        else
-         echo "Wazuh manager nodes: ${nodes}"
-         exit 1
-        fi
+      run: | 
+        for NODE in "${{ env.MANAGER_NODES }}"; do
+          services="`curl -k -s -X GET "https://0.0.0.0:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
+          if [[ $services -gt 9 ]]; then
+            echo "Wazuh Manager $NODE Services: ${services}"
+            echo "OK"
+          else
+            curl -k -X GET "https://0.0.0.0:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
+            exit 1
+          fi
+        done
       env:
         TOKEN: $(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")