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 68f700713 BIGTOP-3978. Drop debian-10 support (#1220)
68f700713 is described below
commit 68f700713d7dfd802422b336a60bbc983347d63e
Author: Peng Lee <[email protected]>
AuthorDate: Mon Dec 25 13:43:50 2023 +0800
BIGTOP-3978. Drop debian-10 support (#1220)
---
bigtop-ci/build.sh | 2 +-
bigtop_toolchain/bin/puppetize.sh | 2 +-
build.gradle | 16 ++++++++--------
packages.gradle | 4 ++--
provisioner/docker/config_debian-10.yaml | 24 ------------------------
5 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/bigtop-ci/build.sh b/bigtop-ci/build.sh
index 47dd66b60..87fd5f8b7 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-10|centos-7|... --target hadoop|tez|..."
+ echo "usage build.sh --prefix trunk|1.4.0|1.3.0|... --os
debian-11|centos-7|... --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 78adc69ed..3c495f884 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -34,7 +34,7 @@ case ${ID}-${VERSION_ID} in
apt-get update
apt-get -y install wget curl sudo unzip puppet
software-properties-common puppet-module-puppetlabs-apt
puppet-module-puppetlabs-stdlib systemd-sysv
;;
- debian-10*|debian-11*)
+ debian-11*)
apt-get update
apt-get -y install wget curl sudo unzip puppet
puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib systemd-sysv gnupg
procps
;;
diff --git a/build.gradle b/build.gradle
index 4d7ff2c1e..31f45173a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,7 +267,7 @@ Properties:
-Pmemory=[4g|8g|...]
-Pnum_instances=[NUM_INSTANCES]
-Pnexus=[NEXUS_URL] (NEXUS_URL is optional)
-
-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
+ -POS=[centos-7|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)
@@ -283,7 +283,7 @@ Create a 3 node cluster:
Run smoke tests on 3 node cluster:
$ ./gradlew -Pnum_instances=3 -Prun_smoke_tests docker-provisioner
Specify custom configuration file:
- $ ./gradlew -Pconfig=config_debian-10.yaml docker-provisioner
+ $ ./gradlew -Pconfig=config_debian-11.yaml docker-provisioner
''',
group: DEPLOY_GROUP) {
def _config = project.hasProperty("config") ? config : "config.yaml"
@@ -562,10 +562,10 @@ task "bigtop-puppet"(type:Exec,
description: '''
Build bigtop/puppet images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-puppet
+ $ ./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
Example:
- $ ./gradlew -POS=debian-10 -Pprefix=3.0.0 bigtop-puppet
- The built image name: bigtop/puppet:3.0.0-debian-10
+ $ ./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"
@@ -581,10 +581,10 @@ task "bigtop-slaves"(type:Exec,
description: '''
Build bigtop/slaves images
Usage:
- $ ./gradlew
-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04|opensuse-42.3|openeuler-22.03]
-Pprefix=[trunk|1.2.1|1.2.0|1.1.0|...] bigtop-slaves
+ $ ./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
Example:
- $ ./gradlew -POS=debian-10 -Pprefix=3.0.0 bigtop-slaves
- The built image name: bigtop/slaves:3.0.0-debian-10
+ $ ./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"
diff --git a/packages.gradle b/packages.gradle
index f3d9ea9f5..cfaabfc1d 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -677,7 +677,7 @@ 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-10|ubuntu-18.04] " +
+ "-POS=[centos-7|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]]" +
@@ -913,7 +913,7 @@ if (nativePackaging) {
task "repo-ind" (
description: "Invoking a native repository in Docker. Usage: \$ ./gradlew
" +
- "-POS=[centos-7|fedora-38|debian-10|ubuntu-18.04] " +
+ "-POS=[centos-7|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"
diff --git a/provisioner/docker/config_debian-10.yaml
b/provisioner/docker/config_debian-10.yaml
deleted file mode 100644
index f028800a0..000000000
--- a/provisioner/docker/config_debian-10.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-debian-10"
-
-repo: "http://repos.bigtop.apache.org/releases/3.2.1/debian/10/$(ARCH)"
-distro: debian
-components: [hdfs, yarn, mapreduce]
-enable_local_repo: false
-smoke_test_components: [hdfs, yarn, mapreduce]
