Skip to content

Commit 9d2a83d

Browse files
slfan1989pan3793stoty
authored
HADOOP-19636. [JDK17] Remove CentOS 7 Support and Clean Up Dockerfile. (#7822)
* HADOOP-19636. [JDK17] Remove CentOS 7 Support and Clean Up Dockerfile. Co-authored-by: Cheng Pan <[email protected]> Co-authored-by: Istvan Toth <[email protected]> Reviewed-by: Xiaoqiao He <[email protected]> Reviewed-by: Steve Loughran <[email protected]> Reviewed-by: Chris Nauroth <[email protected]> Reviewed-by: Cheng Pan <[email protected]> Reviewed-by: Istvan Toth <[email protected]> Signed-off-by: Shilun Fan <[email protected]>
1 parent b440e55 commit 9d2a83d

File tree

4 files changed

+3
-216
lines changed

4 files changed

+3
-216
lines changed

‎dev-support/Jenkinsfile

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@ pipeline {
8383
// optional stages after the first one.
8484
stage ('setup sources') {
8585
steps {
86-
dir("${WORKSPACE}/centos-7") {
87-
sh '''#!/usr/bin/env bash
88-
89-
cp -Rp ${WORKSPACE}/src ${WORKSPACE}/centos-7
90-
'''
91-
}
9286

9387
dir("${WORKSPACE}/centos-8") {
9488
sh '''#!/usr/bin/env bash
@@ -113,52 +107,6 @@ pipeline {
113107
}
114108
}
115109

116-
// This is an optional stage which runs only when there's a change in
117-
// C++/C++ build/platform.
118-
// This stage serves as a means of cross platform validation, which is
119-
// really needed to ensure that any C++ related/platform change doesn't
120-
// break the Hadoop build on Centos 7.
121-
stage ('precommit-run Centos 7') {
122-
environment {
123-
SOURCEDIR = "${WORKSPACE}/centos-7/src"
124-
PATCHDIR = "${WORKSPACE}/centos-7/out"
125-
DOCKERFILE = "${SOURCEDIR}/dev-support/docker/Dockerfile_centos_7"
126-
IS_OPTIONAL = 1
127-
}
128-
129-
steps {
130-
withCredentials(getGithubCreds()) {
131-
sh '''#!/usr/bin/env bash
132-
133-
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
134-
"${SOURCEDIR}/dev-support/jenkins.sh" run_ci
135-
'''
136-
}
137-
}
138-
139-
post {
140-
// Since this is an optional platform, we want to copy the artifacts
141-
// and archive it only if the build fails, to help with debugging.
142-
failure {
143-
sh '''#!/usr/bin/env bash
144-
145-
cp -Rp "${WORKSPACE}/centos-7/out" "${WORKSPACE}"
146-
'''
147-
archiveArtifacts "out/**"
148-
}
149-
150-
cleanup() {
151-
script {
152-
sh '''#!/usr/bin/env bash
153-
154-
chmod u+x "${SOURCEDIR}/dev-support/jenkins.sh"
155-
"${SOURCEDIR}/dev-support/jenkins.sh" cleanup_ci_proc
156-
'''
157-
}
158-
}
159-
}
160-
}
161-
162110
// This is an optional stage which runs only when there's a change in
163111
// C++/C++ build/platform.
164112
// This stage serves as a means of cross platform validation, which is

‎dev-support/docker/Dockerfile_centos_7

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

‎dev-support/docker/pkg-resolver/packages.json

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"ubuntu:focal": "ant",
55
"ubuntu:focal::arch64": "ant",
66
"ubuntu:noble": "ant",
7-
"centos:7": "ant",
87
"centos:8": "ant"
98
},
109
"apt-utils": {
@@ -18,12 +17,8 @@
1817
"ubuntu:focal": "automake",
1918
"ubuntu:noble": "automake",
2019
"ubuntu:focal::arch64": "automake",
21-
"centos:7": "automake",
2220
"centos:8": "automake"
2321
},
24-
"autoconf": {
25-
"centos:7": "autoconf"
26-
},
2722
"bats": {
2823
"debian:10": "bats",
2924
"ubuntu:focal": "bats",
@@ -34,8 +29,7 @@
3429
"debian:10": "build-essential",
3530
"ubuntu:focal": "build-essential",
3631
"ubuntu:noble": "build-essential",
37-
"ubuntu:focal::arch64": "build-essential",
38-
"centos:7": "build-essential"
32+
"ubuntu:focal::arch64": "build-essential"
3933
},
4034
"bzip2": {
4135
"debian:10": [
@@ -54,10 +48,6 @@
5448
"bzip2",
5549
"libbz2-dev"
5650
],
57-
"centos:7": [
58-
"bzip2",
59-
"bzip2-devel"
60-
],
6151
"centos:8": [
6252
"bzip2",
6353
"bzip2-devel"
@@ -68,7 +58,6 @@
6858
"ubuntu:focal": "clang",
6959
"ubuntu:noble": "clang",
7060
"ubuntu:focal::arch64": "clang",
71-
"centos:7": "clang",
7261
"centos:8": "clang"
7362
},
7463
"cmake": {
@@ -93,10 +82,6 @@
9382
"curl",
9483
"libcurl4-openssl-dev"
9584
],
96-
"centos:7": [
97-
"curl",
98-
"libcurl-devel"
99-
],
10085
"centos:8": [
10186
"curl",
10287
"libcurl-devel"
@@ -106,8 +91,7 @@
10691
"debian:10": "doxygen",
10792
"ubuntu:focal": "doxygen",
10893
"ubuntu:noble": "doxygen",
109-
"ubuntu:focal::arch64": "doxygen",
110-
"centos:7": "doxygen"
94+
"ubuntu:focal::arch64": "doxygen"
11195
},
11296
"dnf": {
11397
"centos:8": "dnf"
@@ -129,11 +113,6 @@
129113
"fuse",
130114
"libfuse-dev"
131115
],
132-
"centos:7": [
133-
"fuse",
134-
"fuse-libs",
135-
"fuse-devel"
136-
],
137116
"centos:8": [
138117
"fuse",
139118
"fuse-libs",
@@ -158,15 +137,8 @@
158137
"ubuntu:focal::arch64": [
159138
"gcc",
160139
"g++"
161-
],
162-
"centos:7": [
163-
"centos-release-scl",
164-
"devtoolset-9"
165140
]
166141
},
167-
"gettext": {
168-
"centos:7": "gettext-devel"
169-
},
170142
"git": {
171143
"debian:10": "git",
172144
"ubuntu:focal": "git",
@@ -197,15 +169,13 @@
197169
"ubuntu:focal": "libtool",
198170
"ubuntu:noble": "libtool",
199171
"ubuntu:focal::arch64": "libtool",
200-
"centos:7": "libtool",
201172
"centos:8": "libtool"
202173
},
203174
"openssl": {
204175
"debian:10": "libssl-dev",
205176
"ubuntu:focal": "libssl-dev",
206177
"ubuntu:noble": "libssl-dev",
207178
"ubuntu:focal::arch64": "libssl-dev",
208-
"centos:7": "openssl-devel",
209179
"centos:8": "openssl-devel"
210180
},
211181
"perl": {
@@ -237,15 +207,13 @@
237207
"ubuntu:focal": "libsasl2-dev",
238208
"ubuntu:noble": "libsasl2-dev",
239209
"ubuntu:focal::arch64": "libsasl2-dev",
240-
"centos:7": "cyrus-sasl-devel",
241210
"centos:8": "cyrus-sasl-devel"
242211
},
243212
"snappy": {
244213
"debian:10": "libsnappy-dev",
245214
"ubuntu:focal": "libsnappy-dev",
246215
"ubuntu:noble": "libsnappy-dev",
247-
"ubuntu:focal::arch64": "libsnappy-dev",
248-
"centos:7": "snappy-devel"
216+
"ubuntu:focal::arch64": "libsnappy-dev"
249217
},
250218
"zlib": {
251219
"debian:10": [
@@ -264,10 +232,6 @@
264232
"libzstd-dev",
265233
"zlib1g-dev"
266234
],
267-
"centos:7": [
268-
"zlib-devel",
269-
"lz4-devel"
270-
],
271235
"centos:8": [
272236
"zlib-devel",
273237
"lz4-devel"
@@ -280,19 +244,14 @@
280244
"ubuntu:focal::arch64": "locales"
281245
},
282246
"libtirpc-devel": {
283-
"centos:7": "libtirpc-devel",
284247
"centos:8": "libtirpc-devel",
285248
"ubuntu:noble": "libtirpc-dev"
286249
},
287-
"libpmem": {
288-
"centos:7": "libpmem-devel"
289-
},
290250
"make": {
291251
"debian:10": "make",
292252
"ubuntu:focal": "make",
293253
"ubuntu:noble": "make",
294254
"ubuntu:focal::arch64": "make",
295-
"centos:7": "make",
296255
"centos:8": "make"
297256
},
298257
"maven": {
@@ -326,7 +285,6 @@
326285
"ubuntu:focal": "pinentry-curses",
327286
"ubuntu:noble": "pinentry-curses",
328287
"ubuntu:focal::arch64": "pinentry-curses",
329-
"centos:7": "pinentry-curses",
330288
"centos:8": "pinentry-curses"
331289
},
332290
"pkg-config": {
@@ -366,12 +324,6 @@
366324
"python3-setuptools",
367325
"python3-wheel"
368326
],
369-
"centos:7": [
370-
"python3",
371-
"python3-pip",
372-
"python3-setuptools",
373-
"python3-wheel"
374-
],
375327
"centos:8": [
376328
"python3",
377329
"python3-pip",
@@ -384,7 +336,6 @@
384336
"ubuntu:focal": "rsync",
385337
"ubuntu:noble": "rsync",
386338
"ubuntu:focal::arch64": "rsync",
387-
"centos:7": "rsync",
388339
"centos:8": "rsync"
389340
},
390341
"shellcheck": {
@@ -394,7 +345,6 @@
394345
"ubuntu:focal::arch64": "shellcheck"
395346
},
396347
"shasum": {
397-
"centos:7": "perl-Digest-SHA",
398348
"centos:8": "perl-Digest-SHA"
399349
},
400350
"software-properties-common": {
@@ -408,15 +358,13 @@
408358
"ubuntu:focal": "sudo",
409359
"ubuntu:noble": "sudo",
410360
"ubuntu:focal::arch64": "sudo",
411-
"centos:7": "sudo",
412361
"centos:8": "sudo"
413362
},
414363
"valgrind": {
415364
"debian:10": "valgrind",
416365
"ubuntu:focal": "valgrind",
417366
"ubuntu:noble": "valgrind",
418367
"ubuntu:focal::arch64": "valgrind",
419-
"centos:7": "valgrind",
420368
"centos:8": "valgrind"
421369
},
422370
"yasm": {

‎dev-support/docker/pkg-resolver/platforms.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"ubuntu:focal",
33
"ubuntu:focal::arch64",
44
"ubuntu:noble",
5-
"centos:7",
65
"centos:8",
76
"debian:10"
87
]

0 commit comments

Comments
 (0)