Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci-pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ concurrency:
jobs:
lint:
name: Lint
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
steps:
- name: Check out the repo
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
unit-test:
name: Unit Test
if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
steps:
- name: Check out the repo
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
unit-test-full:
name: Unit Test (Full)
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
steps:
- name: Check out the repo
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
jobs:
init-hermit:
name: Init Hermit Tools
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
steps:
- name: Check out the repo
Expand All @@ -33,7 +33,7 @@ jobs:
check-asset-inventory-supported-version:
needs: [ init-hermit ]
name: Check Asset Inventory supported version
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
outputs:
asset_inventory_supported: ${{ steps.check-asset-inventory-supported-version.outputs.asset_inventory_supported }}
steps:
Expand All @@ -60,7 +60,7 @@ jobs:
ci-azure:
needs: [ init-hermit ]
name: CIS Azure CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
contents: "read"
Expand All @@ -83,7 +83,7 @@ jobs:
ci-azure-asset-inventory:
needs: [ init-hermit, check-asset-inventory-supported-version ]
name: Azure Asset Inventory CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
if: needs.check-asset-inventory-supported-version.outputs.asset_inventory_supported == 'true'
timeout-minutes: 60
permissions:
Expand All @@ -107,7 +107,7 @@ jobs:
ci-aws:
needs: [ init-hermit ]
name: CIS AWS CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
contents: "read"
Expand All @@ -130,7 +130,7 @@ jobs:
ci-aws-asset-inventory:
needs: [ init-hermit, check-asset-inventory-supported-version ]
name: AWS Asset Inventory CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
if: needs.check-asset-inventory-supported-version.outputs.asset_inventory_supported == 'true'
timeout-minutes: 60
permissions:
Expand All @@ -153,7 +153,7 @@ jobs:
ci-gcp:
needs: [ init-hermit ]
name: CIS GCP CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
contents: 'read'
Expand All @@ -177,7 +177,7 @@ jobs:
ci-gcp-asset-inventory:
needs: [ init-hermit, check-asset-inventory-supported-version ]
name: GCP Asset Inventory CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
if: needs.check-asset-inventory-supported-version.outputs.asset_inventory_supported == 'true'
timeout-minutes: 60
permissions:
Expand All @@ -201,7 +201,7 @@ jobs:
ci-cnvm:
needs: [ init-hermit ]
name: CNVM CI
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 75
steps:
- name: Free Disk Space (Ubuntu)
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
# Since we build the cloudbeat in the worker's OS and as non static,
# we need to keep the OS version same as elastic-agent docker image base.
# docker run --interactive --tty --rm --entrypoint bash docker.elastic.co/elastic-agent/elastic-agent-complete:9.3.2 -c 'cat /etc/os-release'
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 40
steps:
- name: Free Disk Space (Ubuntu)
Expand Down Expand Up @@ -263,7 +263,7 @@ jobs:
ci-k8s:
needs: [ init-hermit, docker-images ]
name: ${{ matrix.test-target }}-${{ matrix.kind-config }}
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 120
strategy:
fail-fast: false
Expand Down Expand Up @@ -330,7 +330,7 @@ jobs:
- ci-cnvm
- ci-k8s
name: Upload integration tests results
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cloudformation-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
Deploy-CloudFormation:
name: "Deploy CloudFormation"
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 40
defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/destroy-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ env:

jobs:
Destroy:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 120
# Add "id-token" with the intended permissions.
permissions:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/eks-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ concurrency: EKS-Functional-Tests

jobs:
Setup:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
timeout-minutes: 40
Expand All @@ -55,7 +55,7 @@ jobs:

Build:
name: Build
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 30
steps:
- name: Check out the repo
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:
k8s_context: "test-eks-config-2"
label: "EKS functional tests: config 2"
name: ${{ matrix.label }}
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 90
steps:
- name: Check out the repo
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
name: Publish Results
needs: Test_Matrix
if: always()
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
steps:
- name: Download Artifacts
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ concurrency:
jobs:
package_beat:
name: Package Cloudbeat
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 40
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-cloudformation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

jobs:
publish_cloudformation:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-rule-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions:
jobs:
Sync-Templates:
name: Sync CIS Rule Templates
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
id-token: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-agent-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
generate-matrix:
name: Generate Agent Matrix
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand All @@ -26,7 +26,7 @@ jobs:

test-agents:
name: Agent Compatibility Test
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
needs: ["generate-matrix"]
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ env:

jobs:
Deploy:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 120
defaults:
run:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-gcp-dm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# Test a GCP Deployment Manager deployment using Application Default Credentials
gcp_dm_adc:
name: CSPM GCP with ADC
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
contents: "read"
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
gcp_dm_sa:
needs: gcp_dm_adc
name: CSPM GCP with SA
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 60
permissions:
contents: "read"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

manifest_tests:
name: Manifest Tests
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
timeout-minutes: 15
steps:
- name: Check out the repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/upgrade-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ env:

jobs:
init:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
outputs:
base-stack-version: ${{ steps.set-previous-version.outputs.PREVIOUS_VERSION }}
ess-region: ${{ env.TF_VAR_ess_region }}
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
serverless_mode: false
secrets: inherit
upgrade:
runs-on: ubuntu-22.04
runs-on: ubuntu-26.04
needs: [init, deploy]
timeout-minutes: 120
defaults:
Expand Down
Loading