diff --git a/.github/workflows/4_build_and_push_images.yml b/.github/workflows/4_build_and_push_images.yml index fab5601d..4eaa38e7 100644 --- a/.github/workflows/4_build_and_push_images.yml +++ b/.github/workflows/4_build_and_push_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 @@ -216,7 +216,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/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index f4d2f6b4..1fd26c7d 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 4.x - runs-on: ubuntu-24.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/4_pr_check.yml b/.github/workflows/4_pr_check.yml index 66627d23..941de780 100644 --- a/.github/workflows/4_pr_check.yml +++ b/.github/workflows/4_pr_check.yml @@ -14,7 +14,7 @@ on: 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 @@ -75,7 +75,7 @@ jobs: 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: @@ -216,7 +216,7 @@ jobs: 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: diff --git a/.github/workflows/5_build_and_push_images.yml b/.github/workflows/5_build_and_push_images.yml index f87f211c..e39cf756 100644 --- a/.github/workflows/5_build_and_push_images.yml +++ b/.github/workflows/5_build_and_push_images.yml @@ -84,8 +84,7 @@ permissions: jobs: setup: - runs-on: - group: wz-linux-amd64 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} outputs: WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }} @@ -160,8 +159,7 @@ jobs: package-urls: name: generate package urls - runs-on: - group: wz-linux-amd64 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: setup env: @@ -292,8 +290,7 @@ jobs: path: ${{ env.LOCAL_ARTIFACT_URLS_FILEPATH }} build-and-push: - runs-on: - group: wz-linux-amd64 + runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }} needs: - setup @@ -315,6 +312,12 @@ jobs: ref: ${{ inputs.docker_reference }} 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 uses: docker/setup-qemu-action@v4 @@ -332,13 +335,6 @@ jobs: if: ${{ inputs.dev == true }} 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) if: ${{ inputs.dev == true }} uses: actions/download-artifact@v4 @@ -421,7 +417,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/5_bumper_repository.yml b/.github/workflows/5_bumper_repository.yml index b146f00e..ae1b3e63 100644 --- a/.github/workflows/5_bumper_repository.yml +++ b/.github/workflows/5_bumper_repository.yml @@ -40,7 +40,7 @@ on: jobs: bump: 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: contents: write pull-requests: write diff --git a/.github/workflows/5_check_integration_tools.yml b/.github/workflows/5_check_integration_tools.yml index 739435b6..c22c363a 100644 --- a/.github/workflows/5_check_integration_tools.yml +++ b/.github/workflows/5_check_integration_tools.yml @@ -72,7 +72,7 @@ jobs: (contains(github.event.comment.body, '/test-docker-single') || contains(github.event.comment.body, '/test-docker-multi') || 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: pr_number: ${{ steps.pr_data.outputs.pr_number }} pr_head_ref: ${{ steps.pr_data.outputs.pr_head_ref }} @@ -156,7 +156,7 @@ jobs: if: | always() && (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: pr_head_ref: ${{ steps.ctx.outputs.pr_head_ref }} deployment_matrix: ${{ steps.ctx.outputs.deployment_matrix }} @@ -322,7 +322,7 @@ jobs: always() && needs.prepare.result == 'success' && (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: fail-fast: false matrix: @@ -333,7 +333,7 @@ jobs: # Setup # ----------------------------------------------------------------------- - name: Checkout wazuh-automation - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: wazuh/wazuh-automation ref: ${{ env.AUTOMATION_REFERENCE }} @@ -341,7 +341,7 @@ jobs: path: wazuh-automation - name: Checkout wazuh-docker PR branch - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ needs.prepare.outputs.pr_head_ref }} path: wazuh-docker @@ -848,7 +848,7 @@ jobs: update_check: needs: [get_pr_info, prepare, build_images, docker_test] 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: - name: Update check run uses: actions/github-script@v7 diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index e1bb0358..6bc408d9 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -25,7 +25,7 @@ jobs: prepare-variables: 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: WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }} WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }} @@ -63,7 +63,7 @@ jobs: Execute-Goss-tests: 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: WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }} WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }} @@ -97,7 +97,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: 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 needs: [prepare-variables, Execute-Goss-tests] env: @@ -114,9 +114,6 @@ jobs: - name: Check out code uses: actions/checkout@v4 - - name: free disk space - uses: ./.github/free-disk-space - - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -132,6 +129,12 @@ jobs: name: presigned-artifact-urls-${{ github.run_id }} 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 run: | # Export variables to the environment @@ -372,7 +375,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: 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 needs: [prepare-variables, Execute-Goss-tests] env: @@ -389,9 +392,6 @@ jobs: - name: Check out code uses: actions/checkout@v4 - - name: free disk space - uses: ./.github/free-disk-space - - name: Configure aws credentials uses: aws-actions/configure-aws-credentials@v4 with: @@ -407,6 +407,12 @@ jobs: name: presigned-artifact-urls-${{ github.run_id }} 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 run: | # Export variables to the environment diff --git a/CHANGELOG.md b/CHANGELOG.md index 4108269d..2a5996d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file. ### 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)) - 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))