Skip to content

Commit 847bae1

Browse files
emasabemasab
authored
Remove CentOS 6 and CentOS 7 binaries (#4775)
*Remove CentOS 6 and 7 support as discontinued, keeps using manylinux_2_28 based on AlmaLinux 8 (CentOS 8) * Remove fix for CentOS 6 * Add CHANGELOG entry * Upgrade test and verify package creation or installation using clients repository
1 parent bef137a commit 847bae1

File tree

15 files changed

+71
-93
lines changed

15 files changed

+71
-93
lines changed

‎.semaphore/semaphore.yml‎

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -152,33 +152,19 @@ blocks:
152152
commands:
153153
- '[[ -z $SEMAPHORE_GIT_TAG_NAME ]] || artifact push workflow artifacts/ --destination artifacts/${ARTIFACT_KEY}/'
154154
jobs:
155-
- name: 'Build: centos6 glibc +gssapi'
155+
- name: 'Build: centos8 glibc +gssapi'
156156
env_vars:
157157
- name: ARTIFACT_KEY
158-
value: p-librdkafka__plat-linux__dist-centos6__arch-x64__lnk-std__extra-gssapi
158+
value: p-librdkafka__plat-linux__dist-centos8__arch-x64__lnk-std__extra-gssapi
159159
commands:
160-
- packaging/tools/build-release-artifacts.sh quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 artifacts/librdkafka.tgz
160+
- packaging/tools/build-release-artifacts.sh quay.io/pypa/manylinux_2_28_x86_64:2024.07.01-1 artifacts/librdkafka.tgz
161161

162-
- name: 'Build: centos6 glibc'
162+
- name: 'Build: centos8 glibc'
163163
env_vars:
164164
- name: ARTIFACT_KEY
165-
value: p-librdkafka__plat-linux__dist-centos6__arch-x64__lnk-all
165+
value: p-librdkafka__plat-linux__dist-centos8__arch-x64__lnk-all
166166
commands:
167-
- packaging/tools/build-release-artifacts.sh --disable-gssapi quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 artifacts/librdkafka.tgz
168-
169-
- name: 'Build: centos7 glibc +gssapi'
170-
env_vars:
171-
- name: ARTIFACT_KEY
172-
value: p-librdkafka__plat-linux__dist-centos7__arch-x64__lnk-std__extra-gssapi
173-
commands:
174-
- packaging/tools/build-release-artifacts.sh quay.io/pypa/manylinux2014_x86_64:2024-05-13-0983f6f artifacts/librdkafka.tgz
175-
176-
- name: 'Build: centos7 glibc'
177-
env_vars:
178-
- name: ARTIFACT_KEY
179-
value: p-librdkafka__plat-linux__dist-centos7__arch-x64__lnk-all
180-
commands:
181-
- packaging/tools/build-release-artifacts.sh --disable-gssapi quay.io/pypa/manylinux2014_x86_64:2024-05-13-0983f6f artifacts/librdkafka.tgz
167+
- packaging/tools/build-release-artifacts.sh --disable-gssapi quay.io/pypa/manylinux_2_28_x86_64:2024.07.01-1 artifacts/librdkafka.tgz
182168

183169
- name: 'Build: alpine musl +gssapi'
184170
env_vars:
@@ -208,19 +194,19 @@ blocks:
208194
commands:
209195
- '[[ -z $SEMAPHORE_GIT_TAG_NAME ]] || artifact push workflow artifacts/ --destination artifacts/${ARTIFACT_KEY}/'
210196
jobs:
211-
- name: 'Build: centos7 glibc +gssapi'
197+
- name: 'Build: centos8 glibc +gssapi'
212198
env_vars:
213199
- name: ARTIFACT_KEY
214-
value: p-librdkafka__plat-linux__dist-centos7__arch-arm64__lnk-std__extra-gssapi
200+
value: p-librdkafka__plat-linux__dist-centos8__arch-arm64__lnk-std__extra-gssapi
215201
commands:
216-
- packaging/tools/build-release-artifacts.sh quay.io/pypa/manylinux2014_aarch64:2024-05-13-0983f6f artifacts/librdkafka.tgz
202+
- packaging/tools/build-release-artifacts.sh quay.io/pypa/manylinux_2_28_aarch64:2024.07.01-1 artifacts/librdkafka.tgz
217203

218-
- name: 'Build: centos7 glibc'
204+
- name: 'Build: centos8 glibc'
219205
env_vars:
220206
- name: ARTIFACT_KEY
221-
value: p-librdkafka__plat-linux__dist-centos7__arch-arm64__lnk-all
207+
value: p-librdkafka__plat-linux__dist-centos8__arch-arm64__lnk-all
222208
commands:
223-
- packaging/tools/build-release-artifacts.sh --disable-gssapi quay.io/pypa/manylinux2014_aarch64:2024-05-13-0983f6f artifacts/librdkafka.tgz
209+
- packaging/tools/build-release-artifacts.sh --disable-gssapi quay.io/pypa/manylinux_2_28_aarch64:2024.07.01-1 artifacts/librdkafka.tgz
224210

225211
- name: 'Build: alpine musl +gssapi'
226212
env_vars:

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ librdkafka v2.5.0 is a feature release.
77
* Fix segfault when using long client id because of erased segment when using flexver. (#4689)
88
* Fix for an idempotent producer error, with a message batch not reconstructed
99
identically when retried (#4750)
10+
* Removed support for CentOS 6 and CentOS 7 (#4775).
1011

12+
## Upgrade considerations
13+
14+
* CentOS 6 and CentOS 7 support was removed as they reached EOL
15+
and security patches aren't publicly available anymore.
16+
ABI compatibility from CentOS 8 on is maintained through pypa/manylinux,
17+
AlmaLinux based.
18+
See also [Confluent supported OSs page](https://docs.confluent.io/platform/current/installation/versions-interoperability.html#operating-systems) (#4775).
1119

1220
## Enhancements
1321

‎mklove/modules/configure.libzstd‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ function install_source {
5353
$checksum || return 1
5454
fi
5555

56-
local ldlibs=""
57-
if [[ $MKL_DISTRO == centos ]]; then
58-
ldlibs="-lrt"
59-
fi
60-
61-
time LDLIBS="$ldlibs" make -j DESTDIR="${destdir}" prefix=/usr install
56+
time make -j DESTDIR="${destdir}" prefix=/usr install
6257
return $?
6358
}

‎packaging/cp/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ The base_url is the http S3 bucket path to the a PR job, or similar.
77

88
## How to use
99

10-
$ ./verify-packages.sh 5.3 https://thes3bucketpath/X/Y
11-
10+
$ ./verify-packages.sh 7.6 https://packages.confluent.io
1211

1312
Requires docker and patience.
1413

‎packaging/cp/verify-deb.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ if [[ -z $base_url ]]; then
1212
fi
1313

1414
apt-get update
15-
apt-get install -y apt-transport-https wget
15+
apt-get install -y apt-transport-https wget gnupg2 lsb-release
1616

1717
wget -qO - ${base_url}/deb/${cpver}/archive.key | apt-key add -
1818

19-
19+
release=$(lsb_release -cs)
2020
cat >/etc/apt/sources.list.d/Confluent.list <<EOF
21-
deb [arch=amd64] $base_url/deb/${cpver} stable main
21+
deb [arch=amd64] $base_url/clients/deb ${release} main
2222
EOF
2323

2424
apt-get update
@@ -28,7 +28,6 @@ gcc /v/check_features.c -o /tmp/check_features -lrdkafka
2828

2929
/tmp/check_features
3030

31-
# Verify plugins
32-
apt-get install -y confluent-librdkafka-plugins
33-
34-
/tmp/check_features plugin.library.paths monitoring-interceptor
31+
# FIXME: publish plugins in newer versions
32+
# apt-get install -y confluent-librdkafka-plugins
33+
#/tmp/check_features plugin.library.paths monitoring-interceptor

‎packaging/cp/verify-packages.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@ fi
1717
thisdir="$( cd "$(dirname "$0")" ; pwd -P )"
1818

1919
echo "#### Verifying RPM packages ####"
20-
docker run -v $thisdir:/v centos:7 /v/verify-rpm.sh $cpver $base_url
20+
docker run -v $thisdir:/v rockylinux:8 /v/verify-rpm.sh $cpver $base_url
21+
docker run -v $thisdir:/v rockylinux:9 /v/verify-rpm.sh $cpver $base_url
2122
rpm_status=$?
2223

2324
echo "#### Verifying Debian packages ####"
24-
docker run -v $thisdir:/v ubuntu:16.04 /v/verify-deb.sh $cpver $base_url
25+
docker run -v $thisdir:/v debian:10 /v/verify-deb.sh $cpver $base_url
26+
docker run -v $thisdir:/v debian:11 /v/verify-deb.sh $cpver $base_url
27+
docker run -v $thisdir:/v debian:12 /v/verify-deb.sh $cpver $base_url
28+
docker run -v $thisdir:/v ubuntu:20.04 /v/verify-deb.sh $cpver $base_url
29+
docker run -v $thisdir:/v ubuntu:22.04 /v/verify-deb.sh $cpver $base_url
2530
deb_status=$?
2631

2732

‎packaging/cp/verify-rpm.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ if [[ -z $base_url ]]; then
1212
fi
1313

1414
cat >/etc/yum.repos.d/Confluent.repo <<EOF
15-
[Confluent.dist]
16-
name=Confluent repository (dist)
17-
baseurl=$base_url/rpm/${cpver}/7
18-
gpgcheck=0
19-
gpgkey=$base_url/rpm/${cpver}/archive.key
20-
enabled=1
2115
[Confluent]
2216
name=Confluent repository
2317
baseurl=$base_url/rpm/${cpver}
2418
gpgcheck=1
2519
gpgkey=$base_url/rpm/${cpver}/archive.key
2620
enabled=1
21+
22+
[Confluent-Clients]
23+
name=Confluent Clients repository
24+
baseurl=$base_url/clients/rpm/centos/\$releasever/\$basearch
25+
gpgcheck=1
26+
gpgkey=$base_url/clients/rpm/archive.key
27+
enabled=1
2728
EOF
2829

2930
yum install -y librdkafka-devel gcc

‎packaging/nuget/nugetpackage.py‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -67,34 +67,26 @@ class NugetPackage (Package):
6767
'./usr/local/lib/librdkafka.1.dylib',
6868
'runtimes/osx-arm64/native/librdkafka.dylib'),
6969

70-
# Linux glibc centos6 x64 with GSSAPI
70+
# Linux glibc centos8 x64 with GSSAPI
7171
Mapping({'arch': 'x64',
7272
'plat': 'linux',
73-
'dist': 'centos6',
73+
'dist': 'centos8',
7474
'lnk': 'std'},
7575
'librdkafka.tgz',
7676
'./usr/local/lib/librdkafka.so.1',
7777
'runtimes/linux-x64/native/librdkafka.so'),
78-
# Linux glibc centos6 x64 without GSSAPI (no external deps)
78+
# Linux glibc centos8 x64 without GSSAPI (no external deps)
7979
Mapping({'arch': 'x64',
8080
'plat': 'linux',
81-
'dist': 'centos6',
81+
'dist': 'centos8',
8282
'lnk': 'all'},
8383
'librdkafka.tgz',
8484
'./usr/local/lib/librdkafka.so.1',
85-
'runtimes/linux-x64/native/centos6-librdkafka.so'),
86-
# Linux glibc centos7 x64 with GSSAPI
87-
Mapping({'arch': 'x64',
88-
'plat': 'linux',
89-
'dist': 'centos7',
90-
'lnk': 'std'},
91-
'librdkafka.tgz',
92-
'./usr/local/lib/librdkafka.so.1',
93-
'runtimes/linux-x64/native/centos7-librdkafka.so'),
94-
# Linux glibc centos7 arm64 without GSSAPI (no external deps)
85+
'runtimes/linux-x64/native/centos8-librdkafka.so'),
86+
# Linux glibc centos8 arm64 without GSSAPI (no external deps)
9587
Mapping({'arch': 'arm64',
9688
'plat': 'linux',
97-
'dist': 'centos7',
89+
'dist': 'centos8',
9890
'lnk': 'all'},
9991
'librdkafka.tgz',
10092
'./usr/local/lib/librdkafka.so.1',

‎packaging/nuget/packaging.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def magic_mismatch(path, a):
8484
# p - project (e.g., "confluent-kafka-python")
8585
# bld - builder (e.g., "travis")
8686
# plat - platform ("osx", "linux", ..)
87-
# dist - distro or runtime ("centos6", "mingw", "msvcr", "alpine", ..).
87+
# dist - distro or runtime ("centos8", "mingw", "msvcr", "alpine", ..).
8888
# arch - arch ("x64", ..)
8989
# tag - git tag
9090
# sha - git sha

‎packaging/nuget/staticpackage.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class StaticPackage (Package):
2323
mappings = [
2424
Mapping({'arch': 'x64',
2525
'plat': 'linux',
26-
'dist': 'centos6',
26+
'dist': 'centos8',
2727
'!extra': 'gssapi'},
2828
'librdkafka.tgz',
2929
'./usr/local/include/librdkafka/rdkafka.h',
3030
'rdkafka.h'),
3131
Mapping({'arch': 'x64',
3232
'plat': 'linux',
33-
'dist': 'centos6',
33+
'dist': 'centos8',
3434
'!extra': 'gssapi'},
3535
'librdkafka.tgz',
3636
'./usr/local/share/doc/librdkafka/LICENSES.txt',
@@ -39,15 +39,15 @@ class StaticPackage (Package):
3939
# glibc linux static lib and pkg-config file
4040
Mapping({'arch': 'x64',
4141
'plat': 'linux',
42-
'dist': 'centos6',
42+
'dist': 'centos8',
4343
'lnk': 'all',
4444
'!extra': 'gssapi'},
4545
'librdkafka.tgz',
4646
'./usr/local/lib/librdkafka-static.a',
4747
'librdkafka_glibc_linux_amd64.a'),
4848
Mapping({'arch': 'x64',
4949
'plat': 'linux',
50-
'dist': 'centos6',
50+
'dist': 'centos8',
5151
'lnk': 'all',
5252
'!extra': 'gssapi'},
5353
'librdkafka.tgz',
@@ -57,15 +57,15 @@ class StaticPackage (Package):
5757
# glibc linux arm64 static lib and pkg-config file
5858
Mapping({'arch': 'arm64',
5959
'plat': 'linux',
60-
'dist': 'centos7',
60+
'dist': 'centos8',
6161
'lnk': 'all',
6262
'!extra': 'gssapi'},
6363
'librdkafka.tgz',
6464
'./usr/local/lib/librdkafka-static.a',
6565
'librdkafka_glibc_linux_arm64.a'),
6666
Mapping({'arch': 'arm64',
6767
'plat': 'linux',
68-
'dist': 'centos7',
68+
'dist': 'centos8',
6969
'lnk': 'all',
7070
'!extra': 'gssapi'},
7171
'librdkafka.tgz',

0 commit comments

Comments
 (0)