This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 9fb0de3df BIGTOP-4157. Drop CentOS 7 (#1296)
9fb0de3df is described below
commit 9fb0de3df5e81d50f4cfbe70bf09985eafb0e2e2
Author: Shuhei Yamasaki <[email protected]>
AuthorDate: Fri Sep 20 15:30:10 2024 +0900
BIGTOP-4157. Drop CentOS 7 (#1296)
---
bigtop-ci/build.sh | 2 +-
bigtop_toolchain/bin/puppetize.sh | 10 ----------
build.gradle | 12 ++++++------
docker/bigtop-puppet/build.sh | 4 ++--
docker/bigtop-slaves/build.sh | 4 ++--
packages.gradle | 8 ++++----
provisioner/docker/config.yaml | 2 +-
provisioner/docker/config_centos-7.yaml | 24 ------------------------
8 files changed, 16 insertions(+), 50 deletions(-)
diff --git a/bigtop-ci/build.sh b/bigtop-ci/build.sh
index 87fd5f8b7..dec4e6ccb 100755
--- a/bigtop-ci/build.sh
+++ b/bigtop-ci/build.sh
@@ -17,7 +17,7 @@
BIGTOP_HOME=`cd $(dirname $0)/.. && pwd`
usage() {
- echo "usage build.sh --prefix trunk|1.4.0|1.3.0|... --os
debian-11|centos-7|... --target hadoop|tez|..."
+ echo "usage build.sh --prefix trunk|1.4.0|1.3.0|... --os
debian-11|rockylinux-8|... --target hadoop|tez|..."
echo " [--nexus] [--preferred-java-version 8|11] [--mvn-cache-volume
true|false] [--docker-run-option ...]"
exit 1 # unknown option
}
diff --git a/bigtop_toolchain/bin/puppetize.sh
b/bigtop_toolchain/bin/puppetize.sh
index a23b07600..54e7c1241 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -39,16 +39,6 @@ case ${ID}-${VERSION_ID} in
apt-get update
apt-get -y install wget curl sudo unzip puppet
puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib systemd-sysv gnupg
procps
;;
- centos-7*)
- rpm -ivh
https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
- yum updateinfo
- # BIGTOP-3088: pin puppetlabs-stdlib to 4.12.0 as the one provided by
- # distro (4.25.0) has conflict with puppet<4. Should be removed once
- # puppet in distro is updated.
- yum -y install hostname curl sudo unzip wget rubygems
- gem install --bindir /usr/bin --no-ri --no-rdoc json_pure:2.5.1
puppet:3.6.2
- puppet module install puppetlabs-stdlib --version 4.12.0
- ;;
centos-8*)
sed -i -e 's/^\(mirrorlist\)/#\1/' -e
's,^#baseurl=http://mirror.centos.org,baseurl=https://vault.centos.org,'
/etc/yum.repos.d/CentOS-Linux-*
;&
diff --git a/build.gradle b/build.gradle
index c785a406a..a84e4d4d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -266,7 +266,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
- -POS=[centos-7|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
+ -POS=[rockylinux-8|fedora-35|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...]
-Prepository=[REPO_URL]
-Prun_smoke_tests (run test components defined in config file)
@@ -287,7 +287,7 @@ Specify custom configuration file:
group: DEPLOY_GROUP) {
def _config = project.hasProperty("config") ? config : "config.yaml"
def _num_instances = project.hasProperty("num_instances") ? num_instances : 1
- def _OS = project.hasProperty("OS") ? OS : 'centos-7'
+ def _OS = project.hasProperty("OS") ? OS : 'ubuntu-22.04'
def _prefix = project.hasProperty("prefix") ? prefix : 'trunk'
def command = [
'./docker-hadoop.sh',
@@ -561,14 +561,14 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
+ $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-puppet
The built image name: bigtop/puppet:3.0.0-debian-11
''',
group: DOCKERBUILD_GROUP) {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
- def _OS = project.hasProperty("OS") ? OS : "centos-7"
+ def _OS = project.hasProperty("OS") ? OS : "ubuntu-22.04"
def command = [
'./build.sh', _prefix + '-' + _OS,
]
@@ -580,14 +580,14 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
+ $ ./gradlew
-POS=[rockylinux-8|fedora-35|debian-11|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
Example:
$ ./gradlew -POS=debian-11 -Pprefix=3.0.0 bigtop-slaves
The built image name: bigtop/slaves:3.0.0-debian-11
''',
group: DOCKERBUILD_GROUP) {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
- def _OS = project.hasProperty("OS") ? OS : "centos-7"
+ def _OS = project.hasProperty("OS") ? OS : "ubuntu-22.04"
def command = [
'./build.sh', _prefix + '-' + _OS,
]
diff --git a/docker/bigtop-puppet/build.sh b/docker/bigtop-puppet/build.sh
index f1564eab7..7e3b2021b 100755
--- a/docker/bigtop-puppet/build.sh
+++ b/docker/bigtop-puppet/build.sh
@@ -22,8 +22,8 @@ if [ $# != 1 ]; then
echo
echo "Usage: build.sh <PREIX-OS-VERSION>"
echo
- echo "Example: build.sh trunk-centos-7"
- echo " : build.sh 1.0.0-centos-7"
+ echo "Example: build.sh trunk-ubuntu-22.04"
+ echo " : build.sh 1.0.0-ubuntu-22.04"
exit 1
fi
diff --git a/docker/bigtop-slaves/build.sh b/docker/bigtop-slaves/build.sh
index dcd576a20..6a0640a4f 100755
--- a/docker/bigtop-slaves/build.sh
+++ b/docker/bigtop-slaves/build.sh
@@ -22,8 +22,8 @@ if [ $# != 1 ]; then
echo
echo "Usage: build.sh <PREFIX-OS-VERSION>"
echo
- echo "Example: build.sh trunk-centos-7"
- echo " : build.sh 1.0.0-centos-7"
+ echo "Example: build.sh trunk-ubuntu-22.04"
+ echo " : build.sh 1.0.0-ubuntu-22.04"
exit 1
fi
diff --git a/packages.gradle b/packages.gradle
index af7a5ba18..31d0e3304 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -745,14 +745,14 @@ def genTasks = { target ->
}
task "$target-pkg-ind" (
description: "Invoking a native binary packaging for $target in
Docker. Usage: \$ ./gradlew " +
- "-POS=[centos-7|fedora-38|debian-11|ubuntu-18.04] " +
+ "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] $target-pkg-ind " +
"-Pnexus=[true|false]" +
"[-Ppreferred-java-version=[8|11]]" +
"[-Pmvn-cache-volume=[true|false]]",
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
- def _OS = project.hasProperty("OS") ? OS : "centos-7"
+ def _OS = project.hasProperty("OS") ? OS : "ubuntu-22.04"
if (_OS == "fedora-38" || _OS == "ubuntu-22.04") {
logger.warn(_OS + ' requires privileged mode, pass
`-Pdocker-run-option="--privileged"` to gradle option')
}
@@ -981,11 +981,11 @@ if (nativePackaging) {
task "repo-ind" (
description: "Invoking a native repository in Docker. Usage: \$ ./gradlew
" +
- "-POS=[centos-7|fedora-38|debian-11|ubuntu-18.04] " +
+ "-POS=[rockylinux-8|fedora-38|debian-11|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] repo-ind",
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
- def _OS = project.hasProperty("OS") ? OS : "centos-7"
+ def _OS = project.hasProperty("OS") ? OS : "ubuntu-22.04"
if (_OS == "fedora-38") {
logger.warn('fedora-38 requires privileged mode, pass
`-Pdocker-run-option="--privileged"` to gradle option')
}
diff --git a/provisioner/docker/config.yaml b/provisioner/docker/config.yaml
index 19fef1648..435820d6b 120000
--- a/provisioner/docker/config.yaml
+++ b/provisioner/docker/config.yaml
@@ -1 +1 @@
-config_centos-7.yaml
\ No newline at end of file
+config_ubuntu-22.04.yaml
\ No newline at end of file
diff --git a/provisioner/docker/config_centos-7.yaml
b/provisioner/docker/config_centos-7.yaml
deleted file mode 100644
index 97c00fe36..000000000
--- a/provisioner/docker/config_centos-7.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-docker:
- memory_limit: "4g"
- image: "bigtop/puppet:trunk-centos-7"
-
-repo: "http://repos.bigtop.apache.org/releases/3.3.0/centos/7/$basearch";
-distro: centos
-components: [hdfs, yarn, mapreduce]
-enable_local_repo: false
-smoke_test_components: [hdfs, yarn, mapreduce]
