diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index a215726c..2a71992e 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -31,7 +31,7 @@ on: jobs: bump: name: Repository bumper - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: contents: write pull-requests: write diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index e5b1409e..2e28062c 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -72,7 +72,7 @@ on: jobs: setup: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -130,7 +130,7 @@ jobs: echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT build-and-push: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} permissions: id-token: write @@ -155,9 +155,6 @@ jobs: with: ref: ${{ inputs.docker_reference }} - - name: free disk space - uses: ./.github/free-disk-space - - name: Set up QEMU uses: docker/setup-qemu-action@v4 @@ -176,7 +173,6 @@ jobs: uses: aws-actions/amazon-ecr-login@v2 - name: Log in to Docker Hub - if: ${{ inputs.dev == false }} uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} @@ -216,7 +212,7 @@ jobs: notify: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} 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' }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 684a4ec5..156323c6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,12 +4,18 @@ on: [pull_request] jobs: build-docker-images: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} steps: - name: Check out code uses: actions/checkout@v6 + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Build Wazuh images run: ./build-images.sh working-directory: ./build-docker-images @@ -53,19 +59,8 @@ jobs: path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar retention-days: 1 - - name: Install Goss - uses: e1himself/goss-installation-action@v1.0.3 - with: - version: v0.3.16 - - - name: Execute Goss tests (wazuh-manager) - run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} - env: - GOSS_SLEEP: 30 - GOSS_FILE: .github/.goss.yaml - check-single-node: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: @@ -75,6 +70,12 @@ jobs: - name: Create enviroment variables run: cat .env > $GITHUB_ENV + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + - name: Retrieve saved Wazuh indexer Docker image uses: actions/download-artifact@v8 with: @@ -138,17 +139,6 @@ jobs: exit 1 fi - - name: Check documents into wazuh-alerts index - run: | - sleep 120 - docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" - if [[ $docs -gt 0 ]]; then - echo "wazuh-alerts index documents: ${docs}" - else - echo "wazuh-alerts index documents: ${docs}" - exit 1 - fi - - name: Check Wazuh templates run: | qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`" @@ -202,11 +192,22 @@ jobs: env: TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true") + - name: Check documents into wazuh-alerts index + run: | + sleep 120 + docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" + if [[ $docs -gt 0 ]]; then + echo "wazuh-alerts index documents: ${docs}" + else + echo "wazuh-alerts index documents: ${docs}" + exit 1 + fi + - name: Check errors in ossec.log for Wazuh manager run: ./.github/single-node-log-check.sh check-multi-node: - runs-on: ubuntu-22.04 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: build-docker-images steps: @@ -216,8 +217,11 @@ jobs: - name: Create enviroment variables run: cat .env > $GITHUB_ENV - - name: free disk space - uses: ./.github/free-disk-space + - name: Log in to Docker Hub + uses: docker/login-action@v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Retrieve saved Wazuh dashboard Docker image uses: actions/download-artifact@v8 @@ -288,23 +292,6 @@ jobs: exit 1 fi - - name: Check documents into wazuh-alerts index - run: | - until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``) -gt 0 ]] - do - echo 'Waiting for Wazuh indexer events' - free -m - df -h - sleep 10 - done - docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" - if [[ $docs -gt 0 ]]; then - echo "wazuh-alerts index documents: ${docs}" - else - echo "wazuh-alerts index documents: ${docs}" - exit 1 - fi - - name: Check Wazuh templates run: | qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`" @@ -365,5 +352,22 @@ jobs: env: TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true") + - name: Check documents into wazuh-alerts index + run: | + until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``) -gt 0 ]] + do + echo 'Waiting for Wazuh indexer events' + free -m + df -h + sleep 10 + done + docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`" + if [[ $docs -gt 0 ]]; then + echo "wazuh-alerts index documents: ${docs}" + else + echo "wazuh-alerts index documents: ${docs}" + exit 1 + fi + - name: Check errors in ossec.log for Wazuh manager run: ./.github/multi-node-log-check.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index dd192988..2768495e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Change runners on repository workflows ([#2470](https://github.com/wazuh/wazuh-docker/pull/2470)) ### Fixed