Skip to content

[chore][CI] Remove EOL distros from test matrices #6073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2025
Merged
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
3 changes: 1 addition & 2 deletions .github/workflows/ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
name: Linux Test
needs: lint
# Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "ubuntu1604"]'), matrix.distro)] }}
strategy:
fail-fast: false
matrix:
Expand All @@ -71,7 +71,6 @@ jobs:
- centos9
- debian11
- debian12
- opensuse12
- ubuntu2004
- ubuntu2204

Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/auto-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,18 @@ jobs:
testcase="\"express\",\"tomcat\",\"dotnet\""
# splunk-otel-dotnet currently not supported on arm64
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
# opensuse-12 (leap 42) does not support arm64
exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"TESTCASE\": [${testcase}], \"exclude\": [${exclude}]}"
echo "$matrix" | jq
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

test-package:
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
# Amazon Linux 2 uses cgroup v1
# Ubuntu 24.04 uses cgroup v2
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
# Fallback to Ubuntu 20.04 when appropriate
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
timeout-minutes: 60
needs: [cross-compile, build-package, test-package-matrix]
strategy:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/installer-script-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,19 @@ jobs:
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
arch='"amd64","arm64"'
instrumentation='"none","preload","systemd"'
# opensuse-12 (leap 42) does not support arm64
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"INSTRUMENTATION\": [${instrumentation}], \"exclude\": [${exclude}]}"
echo "$matrix" | jq
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

linux-installer-script-test:
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
# Amazon Linux 2 uses cgroup v1
# Ubuntu 24.04 uses cgroup v2
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
# Fallback to Ubuntu 20.04 when appropriate
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
timeout-minutes: 90
needs: installer-test-matrix
strategy:
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/linux-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,19 @@ jobs:
fi
distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
arch="\"amd64\", \"arm64\""
# opensuse-12 (leap 42) does not support arm64
# amazonlinux-2 and tar-centos-7 require cgroup v1, only available on version 20.04 that doesn't have an arm runner
exclude='{"DISTRO": "opensuse-12", "ARCH": "arm64"},{"DISTRO": "amazonlinux-2", "ARCH": "arm64"},{"DISTRO": "tar-centos-7", "ARCH": "arm64"}'
# amazonlinux-2 requires cgroup v1, only available on version 20.04 that doesn't have an arm runner
exclude='{"DISTRO": "amazonlinux-2", "ARCH": "arm64"}'
matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"exclude\": [${exclude}]}"
echo "$matrix" | jq
echo "matrix=${matrix}" >> $GITHUB_OUTPUT
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}

test-package:
# Amazon Linux 2, OpenSUSE 12, and centos7 use cgroup v1
# Amazon Linux 2 uses cgroup v1
# Ubuntu 24.04 uses cgroup v2
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12' && matrix.DISTRO != 'tar-centos-7') && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
# Fallback to Ubuntu 20.04 when appropriate
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
timeout-minutes: 30
needs: [build-package, test-package-matrix]
strategy:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/puppet-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ jobs:

puppet-test:
name: puppet-test
# Amazon Linux 2 and OpenSUSE 12 use cgroup v1
# Amazon Linux 2 uses cgroup v1
# Ubuntu 24.04 uses cgroup v2
# Fallback to Ubuntu 20.04 when the matrix.DISRO is one of these two above
runs-on: ubuntu-${{ (matrix.DISTRO != 'amazonlinux-2' && matrix.DISTRO != 'opensuse-12') && '24.04' || '20.04' }}
# Fallback to Ubuntu 20.04 when appropriate
runs-on: ubuntu-${{ matrix.DISTRO != 'amazonlinux-2' && '24.04' || '20.04' }}
timeout-minutes: 60
needs:
- puppet-lint
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### 🛑 Breaking changes 🛑

- (Splunk) Support for OpenSUSE 12 and CentOS 7 (tar package) has been dropped ([#6073](https://github.com/signalfx/splunk-otel-collector/pull/6073))

## v0.122.0

This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.122.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.122.1)
Expand Down
4 changes: 2 additions & 2 deletions deployments/ansible/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
Currently, the following Linux distributions and versions are supported:

- Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
- CentOS / Red Hat: 7, 8, 9
- CentOS / Red Hat: 8, 9
- Oracle: 8, 9
- Debian: 9, 10, 11
- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- Ubuntu: 16.04, 18.04, 20.04, 22.04

## Windows
Expand Down
4 changes: 2 additions & 2 deletions deployments/chef/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ https://www.splunk.com/en_us/observability.html).
Currently, the following Linux distributions and versions are supported:

- Amazon Linux: 2
- CentOS / Red Hat: 7, 8, 9
- CentOS / Red Hat: 8, 9
- Oracle: 8, 9
- Debian: 9, 10, 11
- SUSE: 12, 15 (**Note:** Only for Collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- SUSE: 15 (**Note:** Only for Collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- Ubuntu: 18.04, 20.04, 22.04

## Windows
Expand Down
4 changes: 2 additions & 2 deletions deployments/puppet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ OpenTelemetry Collector.
Currently, the following Linux distributions and versions are supported:

- Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
- CentOS / Red Hat: 7, 8, 9
- CentOS / Red Hat: 8, 9
- Oracle: 8, 9
- Debian: 9, 10, 11
- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with Fluentd not currently supported.)
- Ubuntu: 16.04, 18.04, 20.04, 22.04

> Note: `systemd` is required to be installed on the host for service
Expand Down
4 changes: 2 additions & 2 deletions deployments/salt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
Currently, the following Linux distributions and versions are supported:

- Amazon Linux: 2, 2023 (**Note:** Log collection with Fluentd not currently supported for Amazon Linux 2023.)
- CentOS / Red Hat: 7, 8, 9
- CentOS / Red Hat: 8, 9
- Oracle: 8, 9
- Debian: 9, 10, 11
- SUSE: 12, 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with fluentd not currently supported.)
- SUSE: 15 (**Note:** Only for collector versions v0.34.0 or higher. Log collection with fluentd not currently supported.)
- Ubuntu: 16.04, 18.04, 20.04, 22.04

## Prerequisites
Expand Down

This file was deleted.

22 changes: 0 additions & 22 deletions packaging/tests/images/rpm/Dockerfile.opensuse-12

This file was deleted.

22 changes: 0 additions & 22 deletions packaging/tests/images/tar/Dockerfile.tar-centos-7

This file was deleted.

This file was deleted.

Loading