Test 1

wazuh · Nov 12, 2024 · 6d627be · 6d627be
1 parent ed5c197
commit 6d627be
Showing 1 changed file with 38 additions and 29 deletions.
diff --git a/.github/workflows/distributed.yml b/.github/workflows/distributed.yml
@@ -27,6 +27,7 @@ on:
 env:
   COMPOSITE_NAME: "linux-SUBNAME-amd64"
   ALLOCATOR_PATH: "/tmp/allocator_instance"
+  INSTANCE_NAMES: "wi1 wi2 wi3 dashboard manager worker"
 permissions:
   id-token: write # JWT
   contents: read # actions/checkout
@@ -44,7 +45,7 @@ jobs:
           if [ "${{ inputs.SYSTEMS }}" != "null" && "${{ inputs.SYSTEMS }}" != "" ]; then
             SYSTEMS_LIST=${{ inputs.SYSTEMS }}
           else
-            SYSTEMS_LIST='["CentOS_8", "AmazonLinux_2", "Ubuntu_22", "RHEL8"]'
+            SYSTEMS_LIST='["Ubuntu_22"]'
           fi
           echo "SYSTEMS_JSON=$(echo $SYSTEMS_LIST | jq -c '.')" >> $GITHUB_OUTPUT
           echo "Systems JSON: $SYSTEMS_JSON"
@@ -57,6 +58,15 @@ jobs:
           fi
           echo "VERBOSITY=$VERBOSITY" >> $GITHUB_OUTPUT
           echo "Verbosity level: $VERBOSITY"
+      - name: Create common SSH key pair in the ALLOCATOR_PATH
+        run: |
+          mkdir -p $ALLOCATOR_PATH
+          ssh-keygen -t rsa -b 4096 -f $ALLOCATOR_PATH/gha_ansible_key -N ""
+      - name: Upload artifact (ALLOCATOR_PATH directory)
+        uses: actions/upload-artifact@v4
+        with:
+          name: allocator-instance-ssh-${{ github.run_id }}
+          path: ${{ env.ALLOCATOR_PATH }}
     outputs:
       SYSTEMS_JSON: ${{ steps.compute-outputs.outputs.SYSTEMS_JSON }}
       VERBOSITY: ${{ steps.compute-outputs.outputs.VERBOSITY }}
@@ -82,6 +92,11 @@ jobs:
           ref: ${{ inputs.AUTOMATION_REFERENCE }}
           token: ${{ secrets.GH_CLONE_TOKEN }}
           path: wazuh-automation/
+      - name: Download the (SSH) artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: allocator-instance-ssh-${{ github.run_id }}
+          path: ${{ env.ALLOCATOR_PATH }}
       - name: Install python and create virtual environment
         run: |
           sudo apt-get update
@@ -135,10 +150,9 @@ jobs:
       - name: Allocate cluster of EC2 instances
         id: allocator_instance
         run: |
-          instance_names=("wi1" "wi2" "wi3", "dashboard", "manager", "worker")
+          instance_names=($INSTANCE_NAMES)
           inventory_file="$ALLOCATOR_PATH/inventory_all"
-
-          mkdir -p $ALLOCATOR_PATH
+          ssh_key_path="$ALLOCATOR_PATH/gha_ansible_key"
 
           for i in ${!instance_names[@]}; do
             instance_name=${instance_names[$i]}
@@ -149,6 +163,7 @@ jobs:
                 --composite-name ${{ env.COMPOSITE_NAME }} \
                 --working-dir $ALLOCATOR_PATH --track-output $ALLOCATOR_PATH/track_${instance_name}.yml \
                 --inventory-output $ALLOCATOR_PATH/inventory_${instance_name}.yml \
+                --ssh-key "$ssh_key_path" \
                 --instance-name gha_ansible_${{ matrix.system }}_${instance_name}_${{ github.run_id }} --label-team devops --label-termination-date 1d
 
               instance_id=$(grep '^identifier' $ALLOCATOR_PATH/track_${instance_name}.yml | awk '{print $2}')
@@ -175,24 +190,25 @@ jobs:
               elif [[ $i -eq 5 ]]; then
                 echo "worker ansible_host=$ansible_host private_ip=$private_ip" >> $inventory_file
               fi
-
-              if [[ $i -eq ${#instance_names[@]}-1 ]]; then
-                echo "[wi_cluster]" >> $inventory_file
-                echo "wi1" >> $inventory_file
-                echo "wi2" >> $inventory_file
-                echo "wi3" >> $inventory_file
-                echo "[all:vars]" >> $inventory_file
-                echo "ansible_ssh_user=$ansible_user" >> $inventory_file
-                echo "ansible_port=$ansible_port" >> $inventory_file
-                echo "ansible_ssh_private_key_file=$ansible_ssh_private_key_file" >> $inventory_file
-                echo "ansible_ssh_common_args='$ansible_ssh_common_args'" >> $inventory_file
-                echo "ansible_ssh_extra_args='-o StrictHostKeyChecking=no'" >> $inventory_file
-              fi
             ) &
           done
 
           # Wait for all provisioning tasks to complete
           wait
+
+          echo "" >> $inventory_file # blank line to separate groups
+          echo "[wi_cluster]" >> $inventory_file
+          echo "wi1" >> $inventory_file
+          echo "wi2" >> $inventory_file
+          echo "wi3" >> $inventory_file
+
+          echo "" >> $inventory_file
+          echo "[all:vars]" >> $inventory_file
+          echo "ansible_ssh_user=$ansible_user" >> $inventory_file
+          echo "ansible_port=$ansible_port" >> $inventory_file
+          echo "ansible_ssh_private_key_file=$ALLOCATOR_PATH/id_rsa" >> $inventory_file
+          echo "ansible_ssh_common_args='$ansible_ssh_common_args'" >> $inventory_file
+          echo "ansible_ssh_extra_args='-o StrictHostKeyChecking=no'" >> $inventory_file
       - name: Save ALLOCATOR_PATH directory as artifact
         uses: actions/upload-artifact@v4
         with:
@@ -202,16 +218,13 @@ jobs:
         uses: actions/checkout@v4
       - name: Ansible Playbook run Wazuh Distributed Production Ready
         run: |
-          # ansible-playbook ./.github/playbooks/aio-wazuh.yml \
           ansible-playbook playbooks/wazuh-production-ready.yml -b -K \
           -i $ALLOCATOR_PATH/inventory_all \
           -l all \
           ${{ needs.setup-runner.outputs.VERBOSITY }}
   stop-runner:
     name: Stop allocated EC2 instance
     needs:
-      # - start-runner # required to get output from the start-runner job
-      # - install-aio-single-instance # required to wait when the main job is done
         - setup-runner
         - start-runner
     runs-on: ubuntu-latest
@@ -250,18 +263,14 @@ jobs:
           path: ${{ env.ALLOCATOR_PATH }}
       - name: Delete allocated EC2 instance
         run: |
-          # python3 wazuh-automation/deployability/modules/allocation/main.py \
-          # --action delete
-          # --track-output $ALLOCATOR_PATH/track_${instance_name}.yml
+          instance_names=($INSTANCE_NAMES)
           for i in ${!instance_names[@]}; do
             instance_name=${instance_names[$i]}
-            # Delete instance in parallel
+            track_file="$ALLOCATOR_PATH/track_${instance_name}.yml"
+            echo "Deleting instance: $instance_name using track file $track_file"
             (
+              # Delete instance
               python3 wazuh-automation/deployability/modules/allocation/main.py \
-                --action delete --provider aws --size large \
-                --composite-name ${{ env.COMPOSITE_NAME }} \
-                --working-dir $ALLOCATOR_PATH --track-output $ALLOCATOR_PATH/track_${instance_name}.yml \
-                --inventory-output $ALLOCATOR_PATH/inventory_${instance_name}.yml \
-                --instance-name gha_ansible_${{ matrix.system }}_${instance_name} _${{ github.run_id }} --label-team devops --label-termination-date 1d
+                --action delete --provider aws --track-output $track_file
             ) &
           done