Skip to content

Commit

Permalink
[chore] explicitly use ubuntu 24.04 for runners to identify any break…
Browse files Browse the repository at this point in the history
…age (#36709)
  • Loading branch information
atoulme authored Dec 6, 2024
1 parent 585bfc5 commit da8f7c5
Show file tree
Hide file tree
Showing 25 changed files with 59 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-codeowners-to-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
add-owners-to-pr:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/add-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
add-labels:
if: ${{ !github.event.issue.pull_request && startsWith(github.event.comment.body, '/label') && github.repository_owner == 'open-telemetry' }}

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:

jobs:
add-owner:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: run
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-update-jmx-metrics-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check-versions:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
latest-version: ${{ steps.check-versions.outputs.latest-version }}
already-added: ${{ steps.check-versions.outputs.already-added }}
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
echo "already-opened=$already_opened" >> $GITHUB_OUTPUT
update-jmx-metrics-component:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: |
needs.check-versions.outputs.already-added != 'true' &&
needs.check-versions.outputs.already-opened != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: make -j2 gotest GROUP=${{ matrix.group }}
arm-unittest:
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [arm-unittest-matrix]
steps:
- name: Print result
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
jobs:
setup-environment:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -45,15 +45,15 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make install-tools
check-collector-module-version:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
- run: make genotelcontribcol
- name: Check Collector Module Version
run: ./.github/workflows/scripts/check-collector-module-version.sh
check-codeowners:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- cmd-0
- cmd-1
- other
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
run: GOOS=${{ matrix.goos }} GOARCH=amd64 make -j2 golint GROUP=${{ matrix.group }}
lint:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, lint-matrix]
steps:
- name: Print result
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
- pkg
- cmd-0
- cmd-1
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- name: Checkout Repo
Expand All @@ -182,7 +182,7 @@ jobs:
- name: Run `govulncheck`
run: make -j2 gogovulncheck GROUP=${{ matrix.group }}
checks:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
fail-fast: false
matrix:
go-version: ["1.23.0", "1.22.8"] # 1.20 is interpreted as 1.2 without quotes
runner: [ubuntu-latest]
runner: [ubuntu-24.04]
group:
- receiver-0
- receiver-1
Expand Down Expand Up @@ -313,7 +313,7 @@ jobs:
path: ${{ matrix.group }}-coverage.txt
unittest:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, unittest-matrix]
steps:
- name: Print result
Expand All @@ -328,7 +328,7 @@ jobs:
false
fi
coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [unittest]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:
- pkg
- cmd-0
- cmd-1
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -385,7 +385,7 @@ jobs:

integration-tests:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, integration-tests-matrix]
steps:
- name: Print result
Expand All @@ -401,7 +401,7 @@ jobs:
fi
correctness-traces:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -428,7 +428,7 @@ jobs:
- name: Correctness
run: make -C testbed run-correctness-traces-tests
correctness-metrics:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -456,7 +456,7 @@ jobs:
run: make -C testbed run-correctness-metrics-tests

build-examples:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -465,7 +465,7 @@ jobs:
run: make build-examples

cross-compile:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
strategy:
fail-fast: false
Expand Down Expand Up @@ -535,7 +535,7 @@ jobs:
path: ./bin/*

publish-check:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
steps:
- uses: actions/checkout@v4
Expand All @@ -549,7 +549,7 @@ jobs:
id: check
run: ./.github/workflows/scripts/verify-dist-files-exist.sh
publish-dev:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand Down Expand Up @@ -612,7 +612,7 @@ jobs:
docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker push otel/opentelemetry-collector-contrib-dev:latest
publish-stable:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand All @@ -630,7 +630,7 @@ jobs:
# This job updates the "next release" milestone
# to the latest released version and creates a new milestone
# named "next release" in its place
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [publish-stable]
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
changelog:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
env:
PR_HEAD: ${{ github.event.pull_request.head.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
jobs:
changedfiles:
name: changed files
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
PR_HEAD: ${{ github.event.pull_request.head.sha }}
if: ${{ github.actor != 'dependabot[bot]' }}
Expand All @@ -31,7 +31,7 @@ jobs:
run: |
echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)" >> $GITHUB_OUTPUT
check-links:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: changedfiles
if: ${{needs.changedfiles.outputs.md}}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close-stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
GH_TOKEN: ${{ github.token }}
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
jobs:
collector-build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: Checkout
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
path: ./bin/*

supervisor-test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: collector-build
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
go test -v --tags=e2e
docker-build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- processor/k8sattributesprocessor
- receiver/kubeletstatsreceiver
- receiver/k8sobjectsreceiver
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: docker-build
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
kubernetes-test:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [kubernetes-test-matrix]
steps:
- name: Print result
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-component-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
generate-component-labels:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-weekly-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
get_issues:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
path: testbed/tests/results/${{steps.filename.outputs.name}}.json

update-benchmarks:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [loadtest]
if: github.event_name != 'pull_request'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mark-issues-as-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
mark-issues-as-stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/milestone-add-to-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
update-pr:
if: github.event.pull_request.merged
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/github-script@v7
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ping-codeowners-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
ping-owners:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ping-codeowners-on-new-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
ping-owners-on-new-issue:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ping-codeowners-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
ping-owners:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
# Releasing opentelemetry-collector-contrib
prepare-release:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
Loading

0 comments on commit da8f7c5

Please sign in to comment.