yahoo_1999/fk-wazuh
1
0
Fork 0
forked from wazuh/wazuh-docker
Code Pull Requests Activity

Merge pull request #2471 from wazuh/change/3493-change-runners-5.x

Browse Source 
Change runners on repository workflows 5.x
This commit is contained in:
Gonzalo Acuña
2026-06-23 09:28:11 -03:00
committed by GitHub
parent 94f01fb7b0 b14c5535ed
commit e0ad433d59
8 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/4_build_and_push_images.yml
+3 -3
View File
@@ -72,7 +72,7 @@ on:
jobs: jobs:
setup: setup:
runs-on: ubuntu-22.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
permissions: permissions:
id-token: write id-token: write
@@ -130,7 +130,7 @@ jobs:
echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
build-and-push: build-and-push:
runs-on: ubuntu-22.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
permissions: permissions:
id-token: write id-token: write
@@ -216,7 +216,7 @@ jobs:
notify: 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] needs: [setup, build-and-push]
# Only run if NOT dev AND all products were selected # Only run if NOT dev AND all products were selected
if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
.github/workflows/4_bumper_repository.yml
+1 -1
View File
@@ -31,7 +31,7 @@ on:
jobs: jobs:
bump: bump:
name: Repository bumper 4.x name: Repository bumper 4.x
runs-on: ubuntu-24.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
permissions: permissions:
contents: write contents: write
pull-requests: write pull-requests: write
.github/workflows/4_pr_check.yml
+3 -3
View File
@@ -14,7 +14,7 @@ on:
jobs: jobs:
build-docker-images: build-docker-images:
runs-on: ubuntu-22.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
steps: steps:
- name: Check out code - name: Check out code
@@ -75,7 +75,7 @@ jobs:
GOSS_FILE: .github/.goss.yaml GOSS_FILE: .github/.goss.yaml
check-single-node: 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 needs: build-docker-images
steps: steps:
@@ -216,7 +216,7 @@ jobs:
run: ./.github/single-node-log-check.sh run: ./.github/single-node-log-check.sh
check-multi-node: 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 needs: build-docker-images
steps: steps:
.github/workflows/5_build_and_push_images.yml
+10 -14
View File
@@ -84,8 +84,7 @@ permissions:
jobs: jobs:
setup: setup:
runs-on: runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
group: wz-linux-amd64
outputs: outputs:
WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }} WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
@@ -160,8 +159,7 @@ jobs:
package-urls: package-urls:
name: generate package urls name: generate package urls
runs-on: runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
group: wz-linux-amd64
needs: setup needs: setup
env: env:
@@ -292,8 +290,7 @@ jobs:
path: ${{ env.LOCAL_ARTIFACT_URLS_FILEPATH }} path: ${{ env.LOCAL_ARTIFACT_URLS_FILEPATH }}
build-and-push: build-and-push:
runs-on: runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
group: wz-linux-amd64
needs: needs:
- setup - setup
@@ -315,6 +312,12 @@ jobs:
ref: ${{ inputs.docker_reference }} ref: ${{ inputs.docker_reference }}
persist-credentials: false persist-credentials: false
- name: Log in to Docker Hub
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v4 uses: docker/setup-qemu-action@v4
@@ -332,13 +335,6 @@ jobs:
if: ${{ inputs.dev == true }} if: ${{ inputs.dev == true }}
uses: aws-actions/amazon-ecr-login@v2 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 }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Download artifact_urls.yaml (dev) - name: Download artifact_urls.yaml (dev)
if: ${{ inputs.dev == true }} if: ${{ inputs.dev == true }}
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@@ -421,7 +417,7 @@ jobs:
notify: 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] needs: [setup, build-and-push]
# Only run if NOT dev AND all products were selected # Only run if NOT dev AND all products were selected
if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }} if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
.github/workflows/5_bumper_repository.yml
+1 -1
View File
@@ -40,7 +40,7 @@ on:
jobs: jobs:
bump: bump:
name: Repository bumper 5.x name: Repository bumper 5.x
runs-on: ubuntu-24.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
permissions: permissions:
contents: write contents: write
pull-requests: write pull-requests: write
.github/workflows/5_check_integration_tools.yml
+6 -6
View File
@@ -72,7 +72,7 @@ jobs:
(contains(github.event.comment.body, '/test-docker-single') || (contains(github.event.comment.body, '/test-docker-single') ||
contains(github.event.comment.body, '/test-docker-multi') || contains(github.event.comment.body, '/test-docker-multi') ||
contains(github.event.comment.body, '/test-docker')) contains(github.event.comment.body, '/test-docker'))
runs-on: ubuntu-latest runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
outputs: outputs:
pr_number: ${{ steps.pr_data.outputs.pr_number }} pr_number: ${{ steps.pr_data.outputs.pr_number }}
pr_head_ref: ${{ steps.pr_data.outputs.pr_head_ref }} pr_head_ref: ${{ steps.pr_data.outputs.pr_head_ref }}
@@ -156,7 +156,7 @@ jobs:
if: | if: |
always() && always() &&
(needs.get_pr_info.result == 'success' || github.event_name == 'workflow_dispatch') (needs.get_pr_info.result == 'success' || github.event_name == 'workflow_dispatch')
runs-on: ubuntu-latest runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
outputs: outputs:
pr_head_ref: ${{ steps.ctx.outputs.pr_head_ref }} pr_head_ref: ${{ steps.ctx.outputs.pr_head_ref }}
deployment_matrix: ${{ steps.ctx.outputs.deployment_matrix }} deployment_matrix: ${{ steps.ctx.outputs.deployment_matrix }}
@@ -322,7 +322,7 @@ jobs:
always() && always() &&
needs.prepare.result == 'success' && needs.prepare.result == 'success' &&
(needs.build_images.result == 'success' || needs.build_images.result == 'skipped') (needs.build_images.result == 'success' || needs.build_images.result == 'skipped')
runs-on: ubuntu-latest runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@@ -333,7 +333,7 @@ jobs:
# Setup # Setup
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
- name: Checkout wazuh-automation - name: Checkout wazuh-automation
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
repository: wazuh/wazuh-automation repository: wazuh/wazuh-automation
ref: ${{ env.AUTOMATION_REFERENCE }} ref: ${{ env.AUTOMATION_REFERENCE }}
@@ -341,7 +341,7 @@ jobs:
path: wazuh-automation path: wazuh-automation
- name: Checkout wazuh-docker PR branch - name: Checkout wazuh-docker PR branch
uses: actions/checkout@v4 uses: actions/checkout@v6
with: with:
ref: ${{ needs.prepare.outputs.pr_head_ref }} ref: ${{ needs.prepare.outputs.pr_head_ref }}
path: wazuh-docker path: wazuh-docker
@@ -848,7 +848,7 @@ jobs:
update_check: update_check:
needs: [get_pr_info, prepare, build_images, docker_test] needs: [get_pr_info, prepare, build_images, docker_test]
if: always() && github.event_name == 'issue_comment' && needs.get_pr_info.result == 'success' if: always() && github.event_name == 'issue_comment' && needs.get_pr_info.result == 'success'
runs-on: ubuntu-latest runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
steps: steps:
- name: Update check run - name: Update check run
uses: actions/github-script@v7 uses: actions/github-script@v7
.github/workflows/5_pr_check.yml
+16 -10
View File
@@ -25,7 +25,7 @@ jobs:
prepare-variables: prepare-variables:
if: ${{ !github.event.pull_request.draft }} if: ${{ !github.event.pull_request.draft }}
runs-on: ubuntu-latest runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
outputs: outputs:
WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }} WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }}
WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }} WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }}
@@ -63,7 +63,7 @@ jobs:
Execute-Goss-tests: Execute-Goss-tests:
needs: [prepare-variables, build-images] needs: [prepare-variables, build-images]
runs-on: ubuntu-22.04 runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
env: env:
WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }} WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }}
@@ -97,7 +97,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-22.04-arm] os: ["codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}", "codebuild-github-actions-codebuild-runner-devops-arm-${{ github.run_id }}-${{ github.run_attempt }}"]
fail-fast: false fail-fast: false
needs: [prepare-variables, Execute-Goss-tests] needs: [prepare-variables, Execute-Goss-tests]
env: env:
@@ -114,9 +114,6 @@ jobs:
- name: Check out code - name: Check out code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: free disk space
uses: ./.github/free-disk-space
- name: Configure aws credentials - name: Configure aws credentials
uses: aws-actions/configure-aws-credentials@v4 uses: aws-actions/configure-aws-credentials@v4
with: with:
@@ -132,6 +129,12 @@ jobs:
name: presigned-artifact-urls-${{ github.run_id }} name: presigned-artifact-urls-${{ github.run_id }}
path: ./single-node/ path: ./single-node/
- name: Log in to Docker Hub
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Add environment variables into GITHUB_ENV - name: Add environment variables into GITHUB_ENV
run: | run: |
# Export variables to the environment # Export variables to the environment
@@ -372,7 +375,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-22.04-arm] os: ["codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}", "codebuild-github-actions-codebuild-runner-devops-arm-${{ github.run_id }}-${{ github.run_attempt }}"]
fail-fast: false fail-fast: false
needs: [prepare-variables, Execute-Goss-tests] needs: [prepare-variables, Execute-Goss-tests]
env: env:
@@ -389,9 +392,6 @@ jobs:
- name: Check out code - name: Check out code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: free disk space
uses: ./.github/free-disk-space
- name: Configure aws credentials - name: Configure aws credentials
uses: aws-actions/configure-aws-credentials@v4 uses: aws-actions/configure-aws-credentials@v4
with: with:
@@ -407,6 +407,12 @@ jobs:
name: presigned-artifact-urls-${{ github.run_id }} name: presigned-artifact-urls-${{ github.run_id }}
path: ./multi-node/ path: ./multi-node/
- name: Log in to Docker Hub
uses: docker/login-action@v4
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Add environment variables into GITHUB_ENV - name: Add environment variables into GITHUB_ENV
run: | run: |
# Export variables to the environment # Export variables to the environment
CHANGELOG.md
+1
View File
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Change runners on repository workflows 5.x ([#2471](https://github.com/wazuh/wazuh-docker/pull/2471))
- PR revamp modifications 5.x ([#2446](https://github.com/wazuh/wazuh-docker/pull/2446)) - PR revamp modifications 5.x ([#2446](https://github.com/wazuh/wazuh-docker/pull/2446))
- Forbid pr_check workflow execution in draft PRs ([#2399](https://github.com/wazuh/wazuh-docker/pull/2399)) - Forbid pr_check workflow execution in draft PRs ([#2399](https://github.com/wazuh/wazuh-docker/pull/2399))
- Unification of user UID and GID ([#2393](https://github.com/wazuh/wazuh-docker/pull/2393)) - Unification of user UID and GID ([#2393](https://github.com/wazuh/wazuh-docker/pull/2393))