Skip to content

Commit fb352a9

Browse files
authored
[chore][deprecation] Remove testing for Oracle Linux 7 (#5974)
* [chore][deprecation] Remove testing for Oracle Linux 7 * Fix supported versions * Add changelog note * Update CHANGELOG.md
1 parent 7727fda commit fb352a9

File tree

10 files changed

+14
-100
lines changed

10 files changed

+14
-100
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### 🛑 Breaking changes 🛑
6+
7+
- (Splunk) Support for Oracle Linux 7 has been dropped ([#5974](https://github.com/signalfx/splunk-otel-collector/pull/5974))
8+
59
## v0.120.0
610

711
This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.120.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.120.0) and the [opentelemetry-collector-contrib v0.120.1](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.120.1) releases where appropriate.

deployments/ansible/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
1313
Currently, the following Linux distributions and versions are supported:
1414

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

deployments/chef/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ https://www.splunk.com/en_us/observability.html).
1717
Currently, the following Linux distributions and versions are supported:
1818

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

deployments/puppet/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ OpenTelemetry Collector.
88
Currently, the following Linux distributions and versions are supported:
99

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

deployments/salt/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ Observability Cloud](https://www.splunk.com/en_us/observability.html).
88
Currently, the following Linux distributions and versions are supported:
99

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

packaging/tests/deployments/puppet/images/rpm/Dockerfile.oraclelinux-7

Lines changed: 0 additions & 34 deletions
This file was deleted.

packaging/tests/deployments/salt/images/distro_docker_opts.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ rpm:
99
centos-8: ["DISTRO_IMAGE=quay.io/centos/centos:stream8"]
1010
centos-9: ["DISTRO_IMAGE=quay.io/centos/centos:stream9"]
1111
opensuse-15: ["DISTRO_IMAGE=opensuse/leap:15", "PKG_MGR=zypper"]
12-
oraclelinux-7: ["DISTRO_IMAGE=oraclelinux:7", "PKG_MGR=yum"]
1312
oraclelinux-8: ["DISTRO_IMAGE=oraclelinux:8"]

packaging/tests/images/rpm/Dockerfile.oraclelinux-7

Lines changed: 0 additions & 20 deletions
This file was deleted.

packaging/tests/installer_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ def test_installer_with_instrumentation_default(distro, arch, method):
380380

381381
# minimum supported node version required for profiling
382382
node_version = 16
383-
if arch == "arm64" and distro in ("centos-7", "oraclelinux-7"):
383+
if arch == "arm64" and distro in ("centos-7"):
384384
# g++ for these distros is too old to build/compile splunk-otel-js with node v16:
385385
# g++: error: unrecognized command line option '-std=gnu++14'
386386
# use the minimum supported node version without profiling instead
@@ -499,7 +499,7 @@ def test_installer_with_instrumentation_custom(distro, arch, method, sdk):
499499

500500
# minimum supported node version required for profiling
501501
node_version = 16
502-
if arch == "arm64" and distro in ("centos-7", "oraclelinux-7"):
502+
if arch == "arm64" and distro in ("centos-7"):
503503
# g++ for these distros is too old to build/compile splunk-otel-js with node v16:
504504
# g++: error: unrecognized command line option '-std=gnu++14'
505505
# use the minimum supported node version without profiling instead

packaging/tests/instrumentation/images/rpm/Dockerfile.oraclelinux-7

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)